AS7-5112 Add deprecation information to management API metadata

 * initial support for deprecation of attributes
 * initial support for deprecating operations

 fix for list & map attribute marshaller

Author: ctomc

clustering/infinispan/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CommonAttributes.java

@@ -1,9 +1,13 @@
 package org.jboss.as.clustering.infinispan.subsystem;
 
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
 import org.infinispan.eviction.EvictionStrategy;
 import org.infinispan.transaction.LockingMode;
 import org.infinispan.util.concurrent.IsolationLevel;
 import org.jboss.as.controller.AttributeDefinition;
+import org.jboss.as.controller.AttributeMarshaller;
 import org.jboss.as.controller.ObjectListAttributeDefinition;
 import org.jboss.as.controller.ObjectTypeAttributeDefinition;
 import org.jboss.as.controller.SimpleAttributeDefinition;
@@ -16,6 +20,7 @@
 import org.jboss.as.server.ServerEnvironment;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.ModelType;
+import org.jboss.dmr.Property;
 
 /**
  * Attributes used in setting up Infinispan configurations
@@ -309,7 +314,22 @@ public interface CommonAttributes {
     SimpleListAttributeDefinition PROPERTIES = SimpleListAttributeDefinition.Builder.of(ModelKeys.PROPERTIES, PROPERTY).
             setAllowNull(true).
             build();
-    SimpleMapAttributeDefinition INDEXING_PROPERTIES = new SimpleMapAttributeDefinition(ModelKeys.INDEXING_PROPERTIES, ModelKeys.INDEXING_PROPERTIES,true,true);
+    SimpleMapAttributeDefinition INDEXING_PROPERTIES = new SimpleMapAttributeDefinition.Builder(ModelKeys.INDEXING_PROPERTIES, true)
+            .setAllowExpression(true)
+            .setAttributeMarshaller(new AttributeMarshaller() {
+                @Override
+                public void marshallAsElement(AttributeDefinition attribute, ModelNode resourceModel, boolean marshallDefault, XMLStreamWriter writer) throws XMLStreamException {
+                    resourceModel = resourceModel.get(attribute.getName());
+                    if (!resourceModel.isDefined()) { return; }
+                    for (Property property : resourceModel.asPropertyList()) {
+                        writer.writeStartElement(org.jboss.as.controller.parsing.Element.PROPERTY.getLocalName());
+                        writer.writeAttribute(org.jboss.as.controller.parsing.Element.NAME.getLocalName(), property.getName());
+                        writer.writeCharacters(property.getValue().asString());
+                        writer.writeEndElement();
+                    }
+                }
+            })
+            .build();
     SimpleAttributeDefinition PURGE =
             new SimpleAttributeDefinitionBuilder(ModelKeys.PURGE, ModelType.BOOLEAN, true)
                     .setXmlName(Attribute.PURGE.getLocalName())

clustering/infinispan/src/main/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanSubsystemXMLWriter.java

@@ -289,7 +289,7 @@ private void processCommonCacheAttributesElements(XMLExtendedStreamWriter writer
         if (cache.get(ModelKeys.INDEXING).isDefined()|| cache.get(ModelKeys.INDEXING_PROPERTIES).isDefined()){
             writer.writeStartElement(Element.INDEXING.getLocalName());
             CommonAttributes.INDEXING.marshallAsAttribute(cache, writer);
-            CommonAttributes.INDEXING_PROPERTIES.marshalToElement(cache.get(ModelKeys.INDEXING_PROPERTIES),writer);
+            CommonAttributes.INDEXING_PROPERTIES.marshallAsElement(cache,writer);
             writer.writeEndElement();
         }
     }

controller/src/main/java/org/jboss/as/controller/AbstractAttributeDefinitionBuilder.java

@@ -55,6 +55,7 @@ public abstract class AbstractAttributeDefinitionBuilder<BUILDER extends Abstrac
     protected AttributeAccess.Flag[] flags;
     protected AttributeMarshaller attributeMarshaller = null;
     protected boolean resourceOnly = false;
+    protected DeprecationData deprecated = null;
 
     public AbstractAttributeDefinitionBuilder(final String attributeName, final ModelType type) {
         this(attributeName, type, false);
@@ -243,4 +244,9 @@ public BUILDER setResourceOnly() {
         this.resourceOnly = true;
         return (BUILDER) this;
     }
+
+    public BUILDER setDeprecated(ModelVersion since) {
+        this.deprecated = new DeprecationData(since);
+        return (BUILDER) this;
+    }
 }