TAB-4485 : getting rid of the xml content type for configs, simplying a lot the config entities

svn path=/trunk/ehcache/; revision=9043

Author: Dahanne Anthony

management-ehcache-v1/src/main/java/net/sf/ehcache/management/resource/CacheConfigEntity.java

@@ -2,23 +2,7 @@
 
 package net.sf.ehcache.management.resource;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import org.terracotta.management.resource.VersionedEntity;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 
 /**
  * <p>
@@ -28,17 +12,13 @@
  * @author brandony
  * 
  */
-@XmlRootElement(name = "configuration")
 public class CacheConfigEntity extends VersionedEntity {
   private String cacheName;
   private String cacheManagerName;
   private String agentId;
 
-  // include this only in JSON
-  @JsonProperty
   private String xml;
 
-  @XmlAttribute
   public String getCacheManagerName() {
     return cacheManagerName;
   }
@@ -47,16 +27,6 @@ public void setCacheManagerName(String cacheManagerName) {
     this.cacheManagerName = cacheManagerName;
   }
 
-  // include this only in XML
-  @XmlAnyElement
-  @JsonIgnore
-  public Element getParsedXml() throws ParserConfigurationException, IOException, SAXException {
-    DocumentBuilderFactory domFact = DocumentBuilderFactory.newInstance();
-    DocumentBuilder domBuilder = domFact.newDocumentBuilder();
-    return domBuilder.parse(new InputSource(new StringReader(xml))).getDocumentElement();
-  }
-
-  @XmlTransient
   public String getXml() {
     return xml;
   }
@@ -65,7 +35,6 @@ public void setXml(String xml) {
     this.xml = xml;
   }
 
-  @XmlAttribute
   public String getCacheName() {
     return cacheName;
   }
@@ -75,7 +44,6 @@ public void setCacheName(String cacheName) {
   }
 
   @Override
-  @XmlAttribute
   public String getAgentId() {
     return agentId;
   }

management-ehcache-v1/src/main/java/net/sf/ehcache/management/resource/CacheManagerConfigEntity.java

@@ -1,36 +1,16 @@
 package net.sf.ehcache.management.resource;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import org.terracotta.management.resource.VersionedEntity;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 
 /**
  * @author brandony
  */
-@XmlRootElement(name = "configuration")
 public class CacheManagerConfigEntity extends VersionedEntity {
   private String cacheManagerName;
   private String agentId;
 
-  // include this only in JSON
-  @JsonProperty
   private String xml;
 
-  @XmlAttribute
   public String getCacheManagerName() {
     return cacheManagerName;
   }
@@ -39,16 +19,6 @@ public void setCacheManagerName(String cacheManagerName) {
     this.cacheManagerName = cacheManagerName;
   }
 
-  // include this only in XML
-  @XmlAnyElement
-  @JsonIgnore
-  public Element getParsedXml() throws ParserConfigurationException, IOException, SAXException {
-    DocumentBuilderFactory domFact = DocumentBuilderFactory.newInstance();
-    DocumentBuilder domBuilder = domFact.newDocumentBuilder();
-    return domBuilder.parse(new InputSource(new StringReader(xml))).getDocumentElement();
-  }
-
-  @XmlTransient
   public String getXml() {
     return xml;
   }
@@ -58,7 +28,6 @@ public void setXml(String xml) {
   }
 
   @Override
-  @XmlAttribute
   public String getAgentId() {
     return agentId;
   }

management-ehcache-v1/src/main/java/net/sf/ehcache/management/resource/services/CacheConfigsResourceServiceImpl.java

@@ -15,7 +15,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
@@ -70,22 +69,4 @@ public Collection<CacheConfigEntity> getCacheConfigs(@Context UriInfo info) {
       throw new ResourceRuntimeException("Failed to get cache configs", see, Response.Status.BAD_REQUEST.getStatusCode());
     }
   }
-
-  /**
-   * Get a {@code Collection} of {@link net.sf.ehcache.management.resource.CacheConfigEntity} objects representing the
-   * cache manager configuration information provided by the associated monitorable entity's agent given the request
-   * path.
-   *
-   *
-   * @param {@link UriInfo} for this resource request
-   * @return a collection of CacheConfigEntity objects. {@link net.sf.ehcache.management.resource.CacheConfigEntity}
-   *         objects
-   */
-  @Deprecated
-  @GET
-  @Consumes(MediaType.APPLICATION_XML)
-  @Produces(MediaType.APPLICATION_XML)
-  public Collection<CacheConfigEntity> getXMLCacheConfigs(@Context UriInfo info) {
-    return getCacheConfigs(info);
-  }
 }

management-ehcache-v1/src/main/java/net/sf/ehcache/management/resource/services/CacheManagerConfigsResourceServiceImpl.java

@@ -15,7 +15,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
@@ -67,19 +66,4 @@ public Collection<CacheManagerConfigEntity> getCacheManagerConfigs(@Context UriI
     }
   }
 
-  /**
-   * Get a {@code Collection} of {@link CacheManagerConfigEntity} objects representing the cache manager configuration
-   * information provided by the associated monitorable entity's agent given the request path.
-   *
-   *
-   * @param {@link UriInfo} for this resource request
-   * @return a collection of {@link CacheManagerConfigEntity} objects
-   */
-  @Deprecated
-  @GET
-  @Consumes(MediaType.APPLICATION_XML)
-  @Produces(MediaType.APPLICATION_XML)
-  public Collection<CacheManagerConfigEntity> getXMLCacheManagerConfigs(@Context UriInfo info) {
-    return getCacheManagerConfigs(info);
-  }
 }