ISPN-10452 Remove AsElementAttributeSerializer

commons/src/main/java/org/infinispan/commons/configuration/JsonReader.java

@@ -7,7 +7,6 @@
 import org.infinispan.commons.configuration.attributes.Attribute;
 import org.infinispan.commons.configuration.attributes.AttributeDefinition;
 import org.infinispan.commons.configuration.attributes.AttributeSerializer;
-import org.infinispan.commons.configuration.attributes.AttributeSerializer.SerializationMode;
 import org.infinispan.commons.configuration.attributes.AttributeSet;
 import org.infinispan.commons.configuration.elements.ElementDefinition;
 
@@ -60,15 +59,6 @@ private void readNestedAttribute(ConfigurationBuilderInfo builderInfo, String el
       AttributeSet attributes = builderInfo.attributes();
       if (attributes == null) throw new CacheConfigurationException(
             String.format("Cannot find any attribute or element under '%s' to handle element '%s'", builderInfo, element));
-      //Handle attributes serialized as elements
-      for (Attribute a : attributes.attributes()) {
-         AttributeDefinition<?> attributeDefinition = a.getAttributeDefinition();
-         AttributeSerializer<?, ?, ?> serializerConfig = attributeDefinition.getSerializerConfig();
-         SerializationMode serializationMode = serializerConfig.getSerializationMode();
-         if (serializationMode == SerializationMode.AS_ELEMENT && serializerConfig.canRead(element, nesting, null, attributeDefinition)) {
-            readAttribute(builderInfo, element, nesting, null, null);
-         }
-      }
       // Handle attributes serialized as name/value pair
       Pair simpleAttribute1 = findSimpleAttribute(element, null, nesting, builderInfo);
       if (simpleAttribute1 != null) {
@@ -105,7 +95,7 @@ private void readArray(ConfigurationBuilderInfo builderInfo, String enclosing, S
    private void readAttribute(ConfigurationBuilderInfo builderInfo, String enclosing, String nesting, String name, Object value) {
       Pair pair = findSimpleAttribute(enclosing, nesting, name, builderInfo);
       if (pair != null) {
-         readAttribute(enclosing, nesting, value, pair.attribute, pair.builderInfo);
+         readAttribute(enclosing, value, pair.attribute, pair.builderInfo);
       } else {
          ElementDefinition element = builderInfo.getElementDefinition();
          if (element != null && element.isSynthetic(name)) {
@@ -115,10 +105,10 @@ private void readAttribute(ConfigurationBuilderInfo builderInfo, String enclosin
       }
    }
 
-   private void readAttribute(String enclosing, String nesting, Object value, Attribute a, ConfigurationBuilderInfo builderInfo) {
+   private void readAttribute(String enclosing, Object value, Attribute a, ConfigurationBuilderInfo builderInfo) {
       AttributeDefinition<?> attributeDefinition = a.getAttributeDefinition();
       AttributeSerializer serializerConfig = attributeDefinition.getSerializerConfig();
-      Object attrValue = serializerConfig.readAttributeValue(enclosing, nesting, attributeDefinition, value, builderInfo);
+      Object attrValue = serializerConfig.readAttributeValue(enclosing, attributeDefinition, value, builderInfo);
       a.set(attrValue);
    }
 

commons/src/main/java/org/infinispan/commons/configuration/JsonWriter.java

@@ -95,11 +95,16 @@ private void writeAttributes(Json parent, AttributeSet attributeSet, Configurati
          }
 
          if (attribute.isModified()) {
-            if (attrName != null && !attrName.isEmpty() && attrValue != null) {
-               if (topLevelElement.isEmpty()) {
-                  json.set(attrName, attrValue);
-               } else {
-                  json.at(topLevelElement, Json.object()).set(attrName, attrValue);
+            if (attrName == null && attrValue instanceof Map) {
+               Map<String, Object> valueMap = (Map<String, Object>) attrValue;
+               valueMap.forEach(json::set);
+            } else {
+               if (attrName != null && !attrName.isEmpty() && attrValue != null) {
+                  if (topLevelElement.isEmpty()) {
+                     json.set(attrName, attrValue);
+                  } else {
+                     json.at(topLevelElement, Json.object()).set(attrName, attrValue);
+                  }
                }
             }
          }

commons/src/main/java/org/infinispan/commons/configuration/attributes/AttributeSerializer.java

@@ -17,17 +17,10 @@
  */
 public abstract class AttributeSerializer<T, U extends ConfigurationInfo, B extends ConfigurationBuilderInfo> {
 
-   public enum SerializationMode {AS_ELEMENT, AS_ATTRIBUTE}
-
    public boolean canRead(String enclosing, String nestingName, String nestedName, AttributeDefinition attributeDefinition) {
       return nestingName == null && nestedName != null && nestedName.equals(attributeDefinition.xmlName());
    }
 
-   public SerializationMode getSerializationMode() {
-      return SerializationMode.AS_ATTRIBUTE;
-   }
-
-
    /**
     * Returns the parent element that this attribute should be placed under when serializing, or empty String if the attribute is not nested.
     */
@@ -54,20 +47,14 @@ public Object getSerializationValue(Attribute<T> attribute, U configurationEleme
     * for this instance of serializer.
     *
     * @param enclosingElement The parent element where the attribute is located.
-    * @param nesting In case the attributed is serialized as an element, the name of this element or null otherwise.
     * @param attributeDefinition The serialized attribute definition.
     * @param attrValue The serialize attribute value.
     * @param builderInfo the {@link ConfigurationBuilderInfo} where the attribute is defined.
     * @return The attribute value deserialized.
     */
-   public Object readAttributeValue(String enclosingElement, String nesting, AttributeDefinition attributeDefinition, Object attrValue, B builderInfo) {
+   public Object readAttributeValue(String enclosingElement, AttributeDefinition attributeDefinition, Object attrValue, B builderInfo) {
       if (attrValue == null) return null;
       Class type = attributeDefinition.getType();
-      AttributeSerializer serializerConfig = attributeDefinition.getSerializerConfig();
-      SerializationMode serializationMode = serializerConfig.getSerializationMode();
-
-      boolean isElementSerialization = serializationMode == SerializationMode.AS_ELEMENT;
-      if (isElementSerialization) return null;
 
       if (attrValue instanceof Map && type == TypedProperties.class) {
          TypedProperties typedProperties = new TypedProperties();

commons/src/main/java/org/infinispan/commons/configuration/attributes/ClassAttributeSerializer.java

@@ -14,7 +14,7 @@ public class ClassAttributeSerializer<T, U extends ConfigurationInfo, B extends
    public static final AttributeSerializer<Object, ConfigurationInfo, ConfigurationBuilderInfo> INSTANCE = new ClassAttributeSerializer<>();
 
    @Override
-   public Object readAttributeValue(String enclosingElement, String nesting, AttributeDefinition attributeDefinition, Object attrValue, B builderInfo) {
+   public Object readAttributeValue(String enclosingElement, AttributeDefinition attributeDefinition, Object attrValue, B builderInfo) {
       return Util.getInstance(attrValue.toString(), builderInfo.getClass().getClassLoader());
    }
 

core/src/main/java/org/infinispan/configuration/cache/ClusteringConfiguration.java

@@ -48,7 +48,7 @@ public boolean canRead(String enclosing, String nestingName, String nestedName,
       }
 
       @Override
-      public Object readAttributeValue(String enclosing, String nesting, AttributeDefinition attributeDefinition, Object value, ConfigurationBuilderInfo builderInfo) {
+      public Object readAttributeValue(String enclosing, AttributeDefinition attributeDefinition, Object value, ConfigurationBuilderInfo builderInfo) {
          return CacheMode.fromParts(enclosing.substring(0, enclosing.indexOf("-")), value.toString());
       }
 

core/src/main/java/org/infinispan/configuration/cache/GroupsConfiguration.java

@@ -29,7 +29,7 @@ public class GroupsConfiguration implements Matchable<GroupsConfiguration>, Conf
    public final static AttributeDefinition<List<Grouper<?>>> GROUPERS = AttributeDefinition.builder("groupers", null, (Class<List<Grouper<?>>>) (Class<?>) List.class).initializer(LinkedList::new)
          .serializer(new AttributeSerializer<List<Grouper<?>>, GroupsConfiguration, GroupsConfigurationBuilder>() {
             @Override
-            public Object readAttributeValue(String enclosingElement, String nesting, AttributeDefinition attributeDefinition, Object attrValue, GroupsConfigurationBuilder builderInfo) {
+            public Object readAttributeValue(String enclosingElement, AttributeDefinition attributeDefinition, Object attrValue, GroupsConfigurationBuilder builderInfo) {
                List<String> values = (List<String>) attrValue;
                return values.stream().map(v -> Util.getInstance(v, builderInfo.getClass().getClassLoader())).collect(Collectors.toList());
             }

core/src/main/java/org/infinispan/configuration/cache/MemoryConfiguration.java

@@ -2,14 +2,10 @@
 
 import static org.infinispan.configuration.parsing.Element.MEMORY;
 
-import org.infinispan.commons.configuration.AbstractTypedPropertiesConfiguration;
+import java.util.Collections;
+import java.util.List;
+
 import org.infinispan.commons.configuration.ConfigurationInfo;
-import org.infinispan.commons.configuration.attributes.AsElementAttributeSerializer;
-import org.infinispan.commons.configuration.attributes.Attribute;
-import org.infinispan.commons.configuration.attributes.AttributeDefinition;
-import org.infinispan.commons.configuration.attributes.AttributeSerializer;
-import org.infinispan.commons.configuration.attributes.AttributeSet;
-import org.infinispan.commons.configuration.attributes.IdentityAttributeCopier;
 import org.infinispan.commons.configuration.attributes.Matchable;
 import org.infinispan.commons.configuration.elements.DefaultElementDefinition;
 import org.infinispan.commons.configuration.elements.ElementDefinition;
@@ -23,158 +19,101 @@
  */
 public class MemoryConfiguration implements Matchable<MemoryConfiguration>, ConfigurationInfo {
 
-   private static AttributeSerializer<StorageType, MemoryConfiguration, MemoryConfigurationBuilder> STORAGE_SERIALIZER = new AsElementAttributeSerializer<StorageType, MemoryConfiguration, MemoryConfigurationBuilder>() {
-      @Override
-      public boolean canRead(String enclosing, String nestingName, String nestedName, AttributeDefinition attributeDefinition) {
-         return nestedName == null && StorageType.forElement(nestingName) != null;
-      }
-
-      @Override
-      public String getParentElement(MemoryConfiguration configurationElement) {
-         StorageType storageType = configurationElement.storageType();
-         return storageType != null ? storageType.getElement().getLocalName() : null;
-      }
-
-      @Override
-      public Object readAttributeValue(String enclosingElement, String nesting, AttributeDefinition attributeDefinition, Object attrValue, MemoryConfigurationBuilder builderInfo) {
-         return StorageType.forElement(nesting);
-      }
-
-   };
-
-   private static AttributeSerializer<Object, MemoryConfiguration, MemoryConfigurationBuilder> UNDER_STORAGE = new AttributeSerializer<Object, MemoryConfiguration, MemoryConfigurationBuilder>() {
-      @Override
-      public String getParentElement(MemoryConfiguration configurationElement) {
-         StorageType storageType = configurationElement.storageType();
-         return storageType != null ? storageType.getElement().getLocalName() : null;
-      }
-
-      @Override
-      public boolean canRead(String enclosing, String nestingName, String nestedName, AttributeDefinition attributeDefinition) {
-         return StorageType.forElement(nestingName) != null && nestedName.equals(attributeDefinition.xmlName());
-      }
-   };
-
-   public static final AttributeDefinition<Integer> ADDRESS_COUNT = AttributeDefinition.builder("address-count", 1_048_576).serializer(UNDER_STORAGE).build();
-   public static final AttributeDefinition<StorageType> STORAGE_TYPE = AttributeDefinition
-         .builder("storage", StorageType.OBJECT).copier(IdentityAttributeCopier.INSTANCE)
-         .serializer(STORAGE_SERIALIZER)
-         .immutable().build();
-   public static final AttributeDefinition<Long> SIZE = AttributeDefinition.builder("size", -1L).serializer(UNDER_STORAGE).build();
-   public static final AttributeDefinition<EvictionType> EVICTION_TYPE = AttributeDefinition.builder("type", EvictionType.COUNT).xmlName(org.infinispan.configuration.parsing.Attribute.EVICTION.getLocalName()).serializer(UNDER_STORAGE).build();
-   public static final AttributeDefinition<EvictionStrategy> EVICTION_STRATEGY = AttributeDefinition.builder("strategy", EvictionStrategy.NONE).serializer(UNDER_STORAGE).build();
+   private final List<ConfigurationInfo> subElements;
+   private final MemoryStorageConfiguration memoryStorageConfiguration;
 
    public static final ElementDefinition ELEMENT_DEFINITION = new DefaultElementDefinition(MEMORY.getLocalName());
 
-   static public AttributeSet attributeDefinitionSet() {
-      return new AttributeSet(MemoryConfiguration.class, AbstractTypedPropertiesConfiguration.attributeSet(),
-            STORAGE_TYPE, SIZE, EVICTION_TYPE, EVICTION_STRATEGY, ADDRESS_COUNT);
-   }
-
-   private final Attribute<Long> size;
-   private final Attribute<EvictionType> evictionType;
-   private final Attribute<EvictionStrategy> evictionStrategy;
-   private final Attribute<StorageType> storageType;
-   private final Attribute<Integer> addressCount;
-   private final AttributeSet attributes;
-
-   MemoryConfiguration(AttributeSet attributes) {
-      this.attributes = attributes;
-      storageType = attributes.attribute(STORAGE_TYPE);
-      size = attributes.attribute(SIZE);
-      evictionType = attributes.attribute(EVICTION_TYPE);
-      evictionStrategy = attributes.attribute(EVICTION_STRATEGY);
-      addressCount = attributes.attribute(ADDRESS_COUNT);
+   MemoryConfiguration(MemoryStorageConfiguration memoryStorageConfiguration) {
+      this.memoryStorageConfiguration = memoryStorageConfiguration;
+      this.subElements = Collections.singletonList(memoryStorageConfiguration);
    }
 
    @Override
    public ElementDefinition getElementDefinition() {
       return ELEMENT_DEFINITION;
    }
 
+   @Override
+   public List<ConfigurationInfo> subElements() {
+      return subElements;
+   }
+
    /**
     * Storage type to use for the data container
     * @return
     */
    public StorageType storageType() {
-      return storageType.get();
+      return memoryStorageConfiguration.storageType();
    }
 
    /**
     * Size of the eviction, -1 if disabled
     * @return
     */
    public long size() {
-      return size.get();
+      return memoryStorageConfiguration.size();
    }
 
    public void size(long newSize) {
-      size.set(newSize);
+      memoryStorageConfiguration.size(newSize);
    }
 
    /**
     * The configured eviction type
     * @return
     */
    public EvictionType evictionType() {
-      return evictionType.get();
+      return memoryStorageConfiguration.evictionType();
    }
 
    /**
     * The configured eviction strategy
     * @return
     */
    public EvictionStrategy evictionStrategy() {
-      return evictionStrategy.get();
+      return memoryStorageConfiguration.evictionStrategy();
    }
 
    /**
     * Returns whether remove eviction is in use
     * @return
     */
    public boolean isEvictionEnabled() {
-      return size.get() > 0 && evictionStrategy.get().isRemovalBased();
+      return memoryStorageConfiguration.size() > 0 && memoryStorageConfiguration.evictionStrategy().isRemovalBased();
    }
 
    /**
     * The address pointer count
     * @return
     */
    public int addressCount() {
-      return addressCount.get();
-   }
-
-   public AttributeSet attributes() {
-      return attributes;
+      return memoryStorageConfiguration.addressCount();
    }
 
    @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      MemoryConfiguration other = (MemoryConfiguration) obj;
-      if (attributes == null) {
-         if (other.attributes != null)
-            return false;
-      } else if (!attributes.equals(other.attributes))
-         return false;
-      return true;
+   public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+
+      MemoryConfiguration that = (MemoryConfiguration) o;
+
+      return memoryStorageConfiguration.equals(that.memoryStorageConfiguration);
    }
 
+   @Override
    public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((attributes == null) ? 0 : attributes.hashCode());
-      return result;
+      return memoryStorageConfiguration.hashCode();
    }
 
    @Override
    public String toString() {
-      return "MemoryConfiguration [attributes=" + attributes + "]";
+      return "MemoryConfiguration{" +
+            "memoryStorageConfiguration=" + memoryStorageConfiguration +
+            '}';
    }
 
+   public MemoryStorageConfiguration heapConfiguration() {
+      return memoryStorageConfiguration;
+   }
 }