CSW Improvements: GEOS-5930 , GEOS-5937, GEOS-5934, tutorial prefixed name in mapping

Author: NielsCharlier

data/citecsw-2.0.2/csw/Record data/citecsw-2.0.2/csw/Record.properties

@@ -10,7 +10,7 @@ Configuration
 
 In the :file:`<data_dir>/csw` directory, create a new file named :file:`MD_Metadata` (ISO Metadata Profile mapping file) with the following contents::
 
-  @fileIdentifier.CharacterString=id
+  @fileIdentifier.CharacterString=prefixedName
   identificationInfo.AbstractMD_Identification.citation.CI_Citation.title.CharacterString=title
   identificationInfo.AbstractMD_Identification.descriptiveKeywords.MD_Keywords.keyword.CharacterString=keywords	
   identificationInfo.AbstractMD_Identification.abstract.CharacterString=abstract

doc/en/user/source/community/csw/tutorial.rst

@@ -38,15 +38,19 @@ public class DefaultWebCatalogService implements WebCatalogService, ApplicationC
 
     private CSWInfo csw;
 
-    //private GeoServer gs;
+    private GeoServer gs;
 
     private CatalogStore store;
 
     protected ApplicationContext context;
 
     public DefaultWebCatalogService(GeoServer gs) {
         this.csw = gs.getService(CSWInfo.class);
-       // this.gs = gs;
+        this.gs = gs;
+    }
+    
+    public CSWInfo getServiceInfo() {
+        return gs.getService(CSWInfo.class);
     }
 
     @Override

src/community/csw/core/src/main/java/org/geoserver/csw/DefaultWebCatalogService.java

@@ -27,6 +27,11 @@
  * @author Andrea Aime - GeoSolutions
  */
 public interface WebCatalogService {
+    /**
+     * The configuration of the service.
+     */
+    CSWInfo getServiceInfo();
+    
     /**
      * Returns a object model representing the capabilities document
      */

src/community/csw/core/src/main/java/org/geoserver/csw/WebCatalogService.java

@@ -12,10 +12,8 @@
 import org.geoserver.csw.feature.MemoryFeatureCollection;
 import org.geoserver.csw.records.CSWRecordDescriptor;
 import org.geoserver.csw.records.RecordDescriptor;
-import org.geotools.data.complex.filter.XPathUtil;
 import org.geotools.data.store.FilteringFeatureCollection;
 import org.geotools.feature.FeatureCollection;
-import org.geotools.filter.SortByImpl;
 import org.opengis.feature.Feature;
 import org.opengis.feature.type.FeatureType;
 import org.opengis.filter.Filter;

src/community/csw/core/src/main/java/org/geoserver/csw/store/internal/CatalogStoreFeatureCollection.java

@@ -17,8 +17,6 @@
 import org.geoserver.csw.records.RecordDescriptor;
 import org.opengis.filter.Filter;
 import org.opengis.filter.sort.SortBy;
-import org.geotools.data.complex.filter.XPathUtil;
-import org.geotools.filter.SortByImpl;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.util.logging.Logging;
 import org.opengis.feature.Feature;

src/community/csw/core/src/main/java/org/geoserver/csw/store/internal/CatalogStoreFeatureIterator.java

@@ -5,14 +5,16 @@
 package org.geoserver.csw.store.internal;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.geoserver.config.GeoServer;
 import org.geoserver.platform.GeoServerResourceLoader;
+import org.geoserver.security.PropertyFileWatcher;
+import org.geotools.util.logging.Logging;
 
 /**
  * Internal Catalog Store that automatically loads mappings from mapping files in GeoServer Data Directory.
@@ -21,6 +23,31 @@
  *
  */
 public class GeoServerInternalCatalogStore extends InternalCatalogStore {
+    
+    protected static final Logger LOGGER = Logging.getLogger(GeoServerInternalCatalogStore.class);
+    
+    protected Map<String, PropertyFileWatcher> watchers = new HashMap<String, PropertyFileWatcher>();
+    
+    /**
+     * Get Mapping, update from file if changed
+     * 
+     * @param typeName
+     * @return the mapping
+     */
+    public CatalogStoreMapping getMapping(String typeName) {
+        
+        PropertyFileWatcher watcher = watchers.get(typeName);
+        
+        if (watcher!=null && watcher.isModified()  ) {
+            try {
+                addMapping (typeName, CatalogStoreMapping.parse(new HashMap<String, String>((Map) watcher.getProperties())));
+            } catch (IOException e) {
+                LOGGER.log(Level.WARNING, e.toString());
+            }
+        }
+        
+        return super.getMapping( typeName);
+    }
 
     /**
      * Create GeoServerInternalCatalogStore
@@ -32,12 +59,17 @@ public GeoServerInternalCatalogStore(GeoServer geoserver) throws IOException {
         super( geoserver.getCatalog());
         GeoServerResourceLoader loader = geoserver.getCatalog().getResourceLoader();
         File dir = loader.findOrCreateDirectory("csw");
-        for (File f : dir.listFiles()) {       
-            Properties properties = new Properties();
-            FileInputStream in = new FileInputStream(f);
-            properties.load(in);
-            in.close();
-            addMapping (f.getName(), CatalogStoreMapping.parse(new HashMap<String, String>((Map) properties)));
+        for (String typeName : descriptorByType.keySet()) {
+            File f = new File(dir, typeName + ".properties");
+
+            PropertyFileWatcher watcher = new PropertyFileWatcher(f);
+            watchers.put(typeName, watcher);
+            
+            if (f.exists()) {                               
+                addMapping (typeName, CatalogStoreMapping.parse(new HashMap<String, String>((Map) watcher.getProperties())));                
+            } else {
+                addMapping (typeName, new CatalogStoreMapping());
+            }            
         }
     }       
 

src/community/csw/core/src/main/java/org/geoserver/csw/store/internal/GeoServerInternalCatalogStore.java

@@ -10,8 +10,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import net.opengis.cat.csw20.ElementSetType;
-
 import org.geoserver.catalog.Catalog;
 import org.geoserver.csw.feature.MemoryFeatureCollection;
 import org.geoserver.csw.feature.sort.ComplexComparatorFactory;
@@ -59,11 +57,21 @@ public InternalCatalogStore(Catalog catalog) {
     public void addMapping(String typeName, CatalogStoreMapping mapping) {
         mappings.put(typeName, mapping);
     }
+    
+    /**
+     * Get Mapping
+     * 
+     * @param typeName
+     * @return the mapping
+     */
+    public CatalogStoreMapping getMapping(String typeName) {
+        return mappings.get(typeName);
+    }
 
     @Override
     public FeatureCollection getRecordsInternal(RecordDescriptor rd, Query q, Transaction t) throws IOException {
 
-        CatalogStoreMapping mapping = mappings.get(q.getTypeName());
+        CatalogStoreMapping mapping = getMapping(q.getTypeName());
 
         int startIndex = 0;
         if (q.getStartIndex() != null) {

src/community/csw/core/src/main/java/org/geoserver/csw/store/internal/InternalCatalogStore.java

@@ -0,0 +1,56 @@
+package org.geoserver.csw.store.internal;
+
+import static org.junit.Assert.*;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import org.apache.commons.io.FileUtils;
+import org.geoserver.csw.CSWTestSupport;
+import org.junit.Test;
+
+public class GeoServerInternalCatalogStoreTest extends CSWTestSupport {
+        
+    @Test
+    public void testModifyMappingFiles() throws IOException, InterruptedException {
+        
+        //test empty mappings
+        InternalCatalogStore store = new GeoServerInternalCatalogStore(this.getGeoServer());
+        
+        assertNull(store.getMapping("MD_Metadata").getElement("fileIdentifier.CharacterString"));
+        assertNull(store.getMapping("Record").getElement("identifier.value"));        
+        
+        // copy all mappings into the data directory
+        File root = testData.getDataDirectoryRoot();
+        File csw = new File(root, "csw");
+        File records = new File("./src/main/resources/org/geoserver/csw/store/internal");
+        FileUtils.copyDirectory(records, csw); 
+        
+        //wait a second, that is exactly what it takes FileWatcher to update
+        Thread.sleep(1001);
+        
+        //now there should be mappings
+        
+        assertNotNull(store.getMapping("MD_Metadata").getElement("fileIdentifier.CharacterString"));
+        assertNotNull(store.getMapping("Record").getElement("identifier.value")); 
+        
+        assertNull(store.getMapping("Record").getElement("format.value"));
+        
+        //modify mapping file
+        
+        File record = new File(csw, "Record.properties");
+        PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(record, true)));
+        out.println("\nformat.value='img/jpeg'");
+        out.close();     
+
+        //wait a second, that is exactly what it takes FileWatcher to update
+        Thread.sleep(1001);
+                
+        //mapping should be automatically reloaded
+        
+        assertEquals( "img/jpeg", store.getMapping("Record").getElement("format.value").getContent().toString());
+    }
+}

src/community/csw/core/src/main/resources/org/geoserver/csw/store/internal/MD_Metadata src/community/csw/core/src/main/resources/org/geoserver/csw/store/internal/MD_Metadata.properties

@@ -156,7 +156,7 @@ public void testFullTextSearch() throws Exception {
         String request = "csw?service=CSW&version=2.0.2&request=GetRecords&typeNames=csw:Record&resultType=results&elementSetName=brief&constraint=AnyText like '%25about B%25'";
         Document d = getAsDOM(request);
         checkValidationErrors(d, new CSWConfiguration());
-        //print(d);
+        print(d);
 
         // basic checks
         assertXpathEvaluatesTo("3", "//csw:SearchResults/@numberOfRecordsMatched", d);