Merge b388298afb into 6f3e3c5075

src/main/java/it/geosolutions/geoserver/rest/decoder/RESTResource.java

@@ -28,6 +28,8 @@ package it.geosolutions.geoserver.rest.decoder;
 import it.geosolutions.geoserver.rest.decoder.utils.JDOMBuilder;
 import it.geosolutions.geoserver.rest.encoder.feature.FeatureTypeAttribute;
 import it.geosolutions.geoserver.rest.encoder.feature.GSAttributeEncoder;
+import it.geosolutions.geoserver.rest.encoder.metadatalink.GSMetadataLinkInfoEncoder;
+import it.geosolutions.geoserver.rest.encoder.metadatalink.ResourceMetadataLinkInfo;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -41,6 +43,7 @@ import org.jdom.Namespace;
  * Parse a resource (FeatureType or Coverage) returned as XML REST objects.
  * 
  * @author etj
+ * @author Emmanuel Blondel - emmanuel.blondel1@gmail.com | emmanuel.blondel@fao.org
  */
 public class RESTResource {
     protected final Element rootElem;
@@ -154,6 +157,59 @@ public class RESTResource {
         return attrsList;
     }
 
+    /** 
+     * 
+     * @author Emmanuel Blondel
+     * 
+     * @return the list of metadataLinkInfo
+     */
+    public List<Map<ResourceMetadataLinkInfo, String>> getMetadataLinkInfoList() {
+        List<Map<ResourceMetadataLinkInfo, String>> metaLinksList = null;
+
+        final Element metaLinksRoot = rootElem.getChild("metadataLinks");
+        final List<Element> metaLinks = metaLinksRoot.getChildren();
+        if (metaLinks != null) {
+            metaLinksList = new ArrayList<Map<ResourceMetadataLinkInfo, String>>(metaLinks.size());
+            for (Element metaLink : metaLinks) {
+                Map<ResourceMetadataLinkInfo, String> metaLinkMap = new HashMap<ResourceMetadataLinkInfo, String>();
+                metaLinksList.add(metaLinkMap);
+                for (ResourceMetadataLinkInfo rmd : ResourceMetadataLinkInfo.values()) {
+                    String key = rmd.toString();
+                    metaLinkMap.put(rmd, metaLink.getChildText(key));
+                }
+            }
+        }
+        return metaLinksList;
+    }
+
+    
+    /** 
+     * 
+     * @author Emmanuel Blondel
+     * 
+     * @return the list of GSMetadataLinkEncoder
+     */    
+    public List<GSMetadataLinkInfoEncoder> getEncodedMetadataLinkInfoList() {
+        List<GSMetadataLinkInfoEncoder> metaLinksList = null;
+
+        final Element metaLinksRoot = rootElem.getChild("metadataLinks");
+        final List<Element> metaLinks = metaLinksRoot.getChildren();
+        if (metaLinks != null) {
+            metaLinksList = new ArrayList<GSMetadataLinkInfoEncoder>(metaLinks.size());
+            for (Element metaLink : metaLinks) {
+                final GSMetadataLinkInfoEncoder metaLinkEnc = new GSMetadataLinkInfoEncoder();
+                for (ResourceMetadataLinkInfo rmd : ResourceMetadataLinkInfo.values()) {
+                    String key = rmd.toString();
+                    metaLinkEnc.setMetadataLinkInfoMember(rmd, metaLink.getChildText(key)); //change
+                }
+                metaLinksList.add(metaLinkEnc);
+            }
+
+        }
+        return metaLinksList;
+    }
+    
+    
     // /**
     // * @return the list of available attribute names
     // */

src/main/java/it/geosolutions/geoserver/rest/encoder/GSResourceEncoder.java

@@ -29,6 +29,7 @@ import it.geosolutions.geoserver.rest.encoder.coverage.GSCoverageEncoder;
 import it.geosolutions.geoserver.rest.encoder.feature.GSFeatureTypeEncoder;
 import it.geosolutions.geoserver.rest.encoder.metadata.GSDimensionInfoEncoder;
 import it.geosolutions.geoserver.rest.encoder.metadata.GSFeatureDimensionInfoEncoder;
+import it.geosolutions.geoserver.rest.encoder.metadatalink.GSMetadataLinkInfoEncoder;
 import it.geosolutions.geoserver.rest.encoder.utils.ElementUtils;
 import it.geosolutions.geoserver.rest.encoder.utils.NestedElementEncoder;
 import it.geosolutions.geoserver.rest.encoder.utils.PropertyXMLEncoder;
@@ -46,15 +47,18 @@ import org.jdom.filter.Filter;
  * 
  * @author ETj (etj at geo-solutions.it)
  * @author Carlo Cancellieri - carlo.cancellieri@geo-solutions.it
+ * @author Emmanuel Blondel - emmanuel.blondel1@gmail.com | emmanuel.blondel@fao.org
  */
 public abstract class GSResourceEncoder
 		extends PropertyXMLEncoder {
 	public final static String NAME = "name";
 	public final static String METADATA="metadata";
 	public final static String KEYWORDS="keywords";
+	public final static String METADATALINKS="metadataLinks";
 
 	final private GSMetadataEncoder metadata = new GSMetadataEncoder();
 	final private Element keywordsListEncoder = new Element(KEYWORDS);
+	final private Element metadataLinksListEncoder = new Element(METADATALINKS);
 	
 	private class GSMetadataEncoder extends NestedElementEncoder{
 		public GSMetadataEncoder() {
@@ -75,6 +79,7 @@ public abstract class GSResourceEncoder
 		// Link members to the parent
 		addContent(metadata.getRoot());
 		addContent(keywordsListEncoder);
+		addContent(metadataLinksListEncoder);
 	}
 
 	public void setEnabled(boolean enabled) {
@@ -136,6 +141,45 @@ public abstract class GSResourceEncoder
 		})).size() == 0 ? false : true;
 	}
 
+	/**
+     * @param MetadataLink the metadataLink to add
+     * 
+     * @author Emmanuel Blondel
+     */
+    public void addMetadataLinkInfo(GSMetadataLinkInfoEncoder metadataLinkInfo) {
+    	metadataLinksListEncoder.addContent(metadataLinkInfo.getRoot());
+    }
+    
+    
+    /** Quick MetadataLinkInfo set-up
+     * 
+     * @author Emmanuel Blondel
+     * 
+     * @param type
+     * @param metadataType
+     * @param content
+     */
+    public void addMetadataLinkInfo(String type, String metadataType, String content){
+    	final GSMetadataLinkInfoEncoder mde = new GSMetadataLinkInfoEncoder();
+    	mde.setup(type, metadataType, content);
+    	metadataLinksListEncoder.addContent(mde.getRoot());
+    }
+
+
+    /**
+	 * delete a metadataLinkInfo from the list using the metadataURL (MetadataLinkInfo content)
+	 * 
+	 * @author Emmanuel Blondel
+	 * 
+	 * @param metadataURL
+	 * @return true if something is removed, false otherwise
+	 */
+	public boolean delMetadataLinkInfo(final String metadataURL) {
+		return (metadataLinksListEncoder.removeContent(GSMetadataLinkInfoEncoder.getFilterByContent(metadataURL))).size() == 0 ? false
+                : true;
+	}
+	
+	
     /**
      * Reprojection policy for a published layer. One of:
      * <ul>

src/main/java/it/geosolutions/geoserver/rest/encoder/metadatalink/GSMetadataLinkInfoEncoder.java

@@ -0,0 +1,107 @@
+/*
+ *  GeoServer-Manager - Simple Manager Library for GeoServer
+ *  
+ *  Copyright (C) 2007,2011 GeoSolutions S.A.S.
+ *  http://www.geo-solutions.it
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package it.geosolutions.geoserver.rest.encoder.metadatalink;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.jdom.Element;
+import org.jdom.filter.Filter;
+
+import it.geosolutions.geoserver.rest.encoder.utils.ElementUtils;
+import it.geosolutions.geoserver.rest.encoder.utils.PropertyXMLEncoder;
+
+/** GSMetadataLinkEncoder
+ * 
+ * @author Emmanuel Blondel - emmanuel.blondel1@gmail.com | emmanuel.blondel@fao.org
+ *
+ */
+public class GSMetadataLinkInfoEncoder extends PropertyXMLEncoder {
+	
+	public static class filterByContent implements Filter {
+        
+        final private String key;
+        
+        public filterByContent(String content){
+            this.key=content;
+        }
+        
+        private static final long serialVersionUID = 1L;
+
+        public boolean matches(Object obj) {
+                Element el=((Element) obj).getChild(ResourceMetadataLinkInfo.content.toString());
+                if (el!=null && el.getTextTrim().equals(key)) {
+                        return true;
+                }
+                return false;
+        }
+    }
+    
+    public static Filter getFilterByContent(String content){
+        return new filterByContent(content);
+    }
+	
+	
+	public GSMetadataLinkInfoEncoder() {
+		super("metadataLink");	
+	}
+
+	/** quick MetadataLinkInfo set-up
+	 * 
+	 * @param type
+	 * @param metadataType
+	 * @param content
+	 */
+	public void setup(String type, String metadataType, String content){
+		set(ResourceMetadataLinkInfo.type.name(), type);
+		set(ResourceMetadataLinkInfo.metadataType.name(), metadataType);
+		set(ResourceMetadataLinkInfo.content.name(), content);
+	}
+    
+	public void setup(Map<ResourceMetadataLinkInfo, String> metadataLinkInfos){
+	    for (Entry<ResourceMetadataLinkInfo,String> mdLinkInfo:metadataLinkInfos.entrySet()){
+	    	set(mdLinkInfo.getKey().toString(),mdLinkInfo.getValue());
+	    }
+	}
+	
+    public void setMetadataLinkInfoMember(ResourceMetadataLinkInfo type, String value){
+        set(type.toString(),value);
+    }
+    
+
+    public boolean delMetadataLinkInfoMember(ResourceMetadataLinkInfo type){
+        return ElementUtils.remove(this.getRoot(), get(type.toString()));
+    }  
+    
+
+    public String getMetadataLinkInfoMember(ResourceMetadataLinkInfo type){
+        Element el = get(type.toString());
+        if (el!=null)
+            return el.getTextTrim();
+        else
+            return null;
+    }
+  
+}

src/main/java/it/geosolutions/geoserver/rest/encoder/metadatalink/ResourceMetadataLinkInfo.java

@@ -0,0 +1,36 @@
+/*
+ *  GeoServer-Manager - Simple Manager Library for GeoServer
+ *  
+ *  Copyright (C) 2007,2011 GeoSolutions S.A.S.
+ *  http://www.geo-solutions.it
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package it.geosolutions.geoserver.rest.encoder.metadatalink;
+
+/**
+ * Enumeration of featureType metadataLink member
+ * 
+ * @author Emmanuel Blondel - emmanuel.blondel1@gmail.com | emmanuel.blondel@fao.org
+ * 
+ */
+public enum ResourceMetadataLinkInfo {
+	type, metadataType, content
+
+}

src/test/java/it/geosolutions/geoserver/decoder/MetadataDecoderTest.java

@@ -23,6 +23,8 @@ package it.geosolutions.geoserver.decoder;
 
 import it.geosolutions.geoserver.rest.decoder.RESTCoverage;
 import it.geosolutions.geoserver.rest.decoder.RESTDimensionInfo;
+import it.geosolutions.geoserver.rest.encoder.metadatalink.GSMetadataLinkInfoEncoder;
+import it.geosolutions.geoserver.rest.encoder.metadatalink.ResourceMetadataLinkInfo;
 
 import java.io.File;
 import java.io.IOException;
@@ -35,6 +37,7 @@ import org.springframework.core.io.ClassPathResource;
 
 /**
  * @author DamianoG
+ * @author eblondel
  *
  */
 public class MetadataDecoderTest {
@@ -65,10 +68,25 @@ public class MetadataDecoderTest {
                 Assert.assertEquals(el.isEnabled(),true);
             }
         } 
-            
-        
-        
-        
-        
     }
+    
+    @Test
+    public void testMetadataLinkInfo() throws IOException{
+    	File coverageFile = new ClassPathResource("testdata/coverageExample.xml").getFile();
+        String coverageString = FileUtils.readFileToString(coverageFile);
+        RESTCoverage coverage = RESTCoverage.build(coverageString);
+            
+        List<GSMetadataLinkInfoEncoder> list = coverage.getEncodedMetadataLinkInfoList();
+            
+        GSMetadataLinkInfoEncoder metadataLinkInfo1 = list.get(0);
+        Assert.assertEquals(metadataLinkInfo1.getMetadataLinkInfoMember(ResourceMetadataLinkInfo.type),"text/xml");
+        Assert.assertEquals(metadataLinkInfo1.getMetadataLinkInfoMember(ResourceMetadataLinkInfo.metadataType),"ISO19115:2003");
+        Assert.assertEquals(metadataLinkInfo1.getMetadataLinkInfoMember(ResourceMetadataLinkInfo.content),"http://www.organization.org/metadata1");
+    
+        GSMetadataLinkInfoEncoder metadataLinkInfo2 = list.get(1);
+        Assert.assertEquals(metadataLinkInfo2.getMetadataLinkInfoMember(ResourceMetadataLinkInfo.type),"text/html");
+        Assert.assertEquals(metadataLinkInfo2.getMetadataLinkInfoMember(ResourceMetadataLinkInfo.metadataType),"ISO19115:2003");
+        Assert.assertEquals(metadataLinkInfo2.getMetadataLinkInfoMember(ResourceMetadataLinkInfo.content),"http://www.organization.org/metadata2");
+            
+   }
 }

src/test/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureEncoderTest.java

@@ -28,6 +28,7 @@ import it.geosolutions.geoserver.rest.encoder.metadata.GSDimensionInfoEncoder;
 import it.geosolutions.geoserver.rest.encoder.metadata.GSDimensionInfoEncoder.Presentation;
 import it.geosolutions.geoserver.rest.encoder.metadata.GSDimensionInfoEncoder.PresentationDiscrete;
 import it.geosolutions.geoserver.rest.encoder.metadata.GSFeatureDimensionInfoEncoder;
+import it.geosolutions.geoserver.rest.encoder.metadatalink.GSMetadataLinkInfoEncoder;
 import it.geosolutions.geoserver.rest.encoder.utils.ElementUtils;
 import it.geosolutions.geoserver.rest.publisher.GeoserverRESTPublisherTest;
 
@@ -71,6 +72,11 @@ public class GSFeatureEncoderTest extends GeoserverRESTPublisherTest {
         fte.setDescription("desc");
         fte.setEnabled(true);
         
+        //metadataLink
+        GSMetadataLinkInfoEncoder metadatalink = new GSMetadataLinkInfoEncoder();
+        metadatalink.setup("text/xml", "ISO19115:2003","http://www.organization.org/metadata1");
+        fte.addMetadataLinkInfo(metadatalink);
+
         GSLayerEncoder layerEncoder = new GSLayerEncoder();
         layerEncoder.setEnabled(true);
         layerEncoder.setQueryable(true);
@@ -187,6 +193,14 @@ public class GSFeatureEncoderTest extends GeoserverRESTPublisherTest {
         Assert.assertTrue(encoder.delKeyword("KEYWORD_2"));
         Assert.assertFalse(encoder.delKeyword("KEYWORD_M"));
 
+        //metadataLinkInfo
+        encoder.addMetadataLinkInfo("text/xml", "ISO19115:2003","http://www.organization.org/metadata1");
+        encoder.addMetadataLinkInfo("text/html", "ISO19115:2003","http://www.organization.org/metadata2");
+        
+        Assert.assertTrue(encoder.delMetadataLinkInfo("http://www.organization.org/metadata2"));
+        Assert.assertFalse(encoder.delMetadataLinkInfo("http://www.organization.org/metadata3"));
+        
+        //dimensions
         final GSFeatureDimensionInfoEncoder elevationDimension = new GSFeatureDimensionInfoEncoder(
                 "elevation_field");
 

src/test/java/it/geosolutions/geoserver/rest/encoder/metadatalink/GSMetadataLinkInfoEncoderTest.java

@@ -0,0 +1,53 @@
+/*
+ *  Copyright (C) 2007 - 2011 GeoSolutions S.A.S.
+ *  http://www.geo-solutions.it
+ * 
+ *  GPLv3 + Classpath exception
+ * 
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package it.geosolutions.geoserver.rest.encoder.metadatalink;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+/**
+*
+* @author eblondel
+*
+*/
+public class GSMetadataLinkInfoEncoderTest {
+
+	@Test
+	public void metadataLinkInfoTest(){
+		GSMetadataLinkInfoEncoder encoder = new GSMetadataLinkInfoEncoder();
+		encoder.setup("text/xml", "ISO19115:2003","http://www.organization.org/metadata1");
+
+		Assert.assertEquals("text/xml", encoder.getMetadataLinkInfoMember(ResourceMetadataLinkInfo.type));
+		Assert.assertEquals("ISO19115:2003", encoder.getMetadataLinkInfoMember(ResourceMetadataLinkInfo.metadataType));
+		Assert.assertEquals("http://www.organization.org/metadata1", encoder.getMetadataLinkInfoMember(ResourceMetadataLinkInfo.content));
+
+		Assert.assertTrue(encoder.delMetadataLinkInfoMember(ResourceMetadataLinkInfo.content));
+		Assert.assertNull(encoder.getMetadataLinkInfoMember(ResourceMetadataLinkInfo.content));
+
+		encoder.setMetadataLinkInfoMember(ResourceMetadataLinkInfo.type, "text/html");
+		encoder.setMetadataLinkInfoMember(ResourceMetadataLinkInfo.metadataType, "FGDC");
+		encoder.setMetadataLinkInfoMember(ResourceMetadataLinkInfo.content, "http://www.organization.org/metadata2");
+		Assert.assertEquals("text/html", encoder.getMetadataLinkInfoMember(ResourceMetadataLinkInfo.type));
+		Assert.assertEquals("FGDC", encoder.getMetadataLinkInfoMember(ResourceMetadataLinkInfo.metadataType));
+		Assert.assertEquals("http://www.organization.org/metadata2", encoder.getMetadataLinkInfoMember(ResourceMetadataLinkInfo.content));
+
+	}
+}

src/test/resources/testdata/coverageExample.xml

@@ -7,6 +7,18 @@
     <atom:link xmlns:atom="http://www.w3.org/2005/Atom" rel="alternate" href="http://localhost:8080/geoserver/rest/namespaces/topp.xml" type="application/xml"/>
   </namespace>
   <title>granuleTestMosaic</title>
+  <metadataLinks>
+  	<metadataLink>
+  		<type>text/xml</type>
+  		<metadataType>ISO19115:2003</metadataType>
+  		<content>http://www.organization.org/metadata1</content>
+  	</metadataLink>
+  	<metadataLink>
+  		<type>text/html</type>
+  		<metadataType>ISO19115:2003</metadataType>
+  		<content>http://www.organization.org/metadata2</content>
+  	</metadataLink>
+  </metadataLinks>
   <nativeCRS>GEOGCS[&quot;WGS 84&quot;, &#xd;
   DATUM[&quot;World Geodetic System 1984&quot;, &#xd;
     SPHEROID[&quot;WGS 84&quot;, 6378137.0, 298.257223563, AUTHORITY[&quot;EPSG&quot;,&quot;7030&quot;]], &#xd;