GEOMESA-482 fixing geoserver namespace issues

* Implementing namespace aware methods in AccumuloDataStore, FeatureStore, FeatureSource
* Allowing complex namespaces in SimpleFeatureTypes

Author: elahrvivaz

geomesa-core/src/main/scala/org/locationtech/geomesa/core/data/AccumuloDataStore.scala

@@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableSortedSet
 import com.typesafe.scalalogging.slf4j.Logging
 import org.apache.accumulo.core.client._
 import org.apache.accumulo.core.client.admin.TimeType
-import org.apache.accumulo.core.client.mock.MockConnector
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken
 import org.apache.accumulo.core.data.{Key, Value}
 import org.apache.accumulo.core.file.keyfunctor.{ColumnFamilyFunctor, RowFunctor}
@@ -32,6 +31,7 @@ import org.apache.hadoop.io.Text
 import org.geotools.data._
 import org.geotools.data.simple.SimpleFeatureSource
 import org.geotools.factory.Hints
+import org.geotools.feature.NameImpl
 import org.geotools.geometry.jts.ReferencedEnvelope
 import org.geotools.process.vector.TransformProcess
 import org.locationtech.geomesa.core
@@ -44,7 +44,7 @@ import org.locationtech.geomesa.core.security.AuthorizationsProvider
 import org.locationtech.geomesa.data.TableSplitter
 import org.locationtech.geomesa.utils.geotools.SimpleFeatureTypes
 import org.locationtech.geomesa.utils.geotools.SimpleFeatureTypes.{FeatureSpec, NonGeomAttributeSpec}
-import org.opengis.feature.`type`.AttributeDescriptor
+import org.opengis.feature.`type`.{AttributeDescriptor, Name}
 import org.opengis.feature.simple.SimpleFeatureType
 import org.opengis.filter.Filter
 import org.opengis.referencing.crs.CoordinateReferenceSystem
@@ -184,7 +184,7 @@ class AccumuloDataStore(val connector: Connector,
    * @param attributes
    */
   def updateIndexedAttributes(featureName: String, attributes: String): Unit = {
-    val FeatureSpec(existing, _) = SimpleFeatureTypes.parse(getAttributes(featureName))
+    val FeatureSpec(existing, _) = SimpleFeatureTypes.parse(getAttributes(featureName).getOrElse(""))
     val FeatureSpec(updated, _)  = SimpleFeatureTypes.parse(attributes)
     // check that the only changes are to non-geometry index flags
     val ok = existing.length == updated.length &&
@@ -605,12 +605,18 @@ class AccumuloDataStore(val connector: Connector,
 
   // NB:  By default, AbstractDataStore is "isWriteable".  This means that createFeatureSource returns
   // a featureStore
-  override def getFeatureSource(featureName: String): SimpleFeatureSource = {
-    validateMetadata(featureName)
-    if(!cachingConfig) new AccumuloFeatureStore(this, featureName)
-    else new AccumuloFeatureStore(this, featureName) with CachingFeatureSource
+  override def getFeatureSource(typeName: Name): SimpleFeatureSource = {
+    validateMetadata(typeName.getLocalPart)
+    if (cachingConfig) {
+      new AccumuloFeatureStore(this, typeName) with CachingFeatureSource
+    } else {
+      new AccumuloFeatureStore(this, typeName)
+    }
   }
 
+  override def getFeatureSource(typeName: String): SimpleFeatureSource =
+    getFeatureSource(new NameImpl(typeName))
+
   /**
    * Reads the index schema format out of the metadata
    *
@@ -627,7 +633,7 @@ class AccumuloDataStore(val connector: Connector,
    * @return
    */
   private def getAttributes(featureName: String) =
-    metadata.read(featureName, ATTRIBUTES_KEY).getOrElse(EMPTY_STRING)
+    metadata.read(featureName, ATTRIBUTES_KEY)
 
   /**
    * Reads the feature encoding from the metadata. Defaults to TEXT if there is no metadata.
@@ -693,24 +699,24 @@ class AccumuloDataStore(val connector: Connector,
    * @return the corresponding feature type (schema) for this feature name,
    *         or NULL if this feature name does not appear to exist
    */
-  override def getSchema(featureName: String): SimpleFeatureType =
-    getAttributes(featureName) match {
-      case attributes if attributes.isEmpty =>
-        null
-      case attributes                       =>
-        val sft = SimpleFeatureTypes.createType(featureName, attributes)
-        val dtgField = metadata.read(featureName, DTGFIELD_KEY)
-          .getOrElse(core.DEFAULT_DTG_PROPERTY_NAME)
-        val indexSchema = metadata.read(featureName, SCHEMA_KEY).orNull
-        // If no data is written, we default to 'false' in order to support old tables.
-        val sharingBoolean = metadata.read(featureName, SHARED_TABLES_KEY).getOrElse("false")
-
-        sft.getUserData.put(core.index.SF_PROPERTY_START_TIME, dtgField)
-        sft.getUserData.put(core.index.SF_PROPERTY_END_TIME, dtgField)
-        sft.getUserData.put(core.index.SFT_INDEX_SCHEMA, indexSchema)
-        core.index.setTableSharing(sft, new java.lang.Boolean(sharingBoolean))
-        sft
-    }
+  override def getSchema(featureName: String): SimpleFeatureType = getSchema(new NameImpl(featureName))
+
+  override def getSchema(name: Name): SimpleFeatureType = {
+    val featureName = name.getLocalPart
+    getAttributes(featureName).map { attributes =>
+      val sft = SimpleFeatureTypes.createType(name.getURI, attributes)
+      val dtgField = metadata.read(featureName, DTGFIELD_KEY).getOrElse(core.DEFAULT_DTG_PROPERTY_NAME)
+      val indexSchema = metadata.read(featureName, SCHEMA_KEY).orNull
+      // If no data is written, we default to 'false' in order to support old tables.
+      val sharingBoolean = metadata.read(featureName, SHARED_TABLES_KEY).getOrElse("false")
+
+      sft.getUserData.put(core.index.SF_PROPERTY_START_TIME, dtgField)
+      sft.getUserData.put(core.index.SF_PROPERTY_END_TIME, dtgField)
+      sft.getUserData.put(core.index.SFT_INDEX_SCHEMA, indexSchema)
+      core.index.setTableSharing(sft, new java.lang.Boolean(sharingBoolean))
+      sft
+    }.orNull
+  }
 
   // Implementation of Abstract method
   def getFeatureReader(featureName: String): AccumuloFeatureReader = getFeatureReader(featureName, Query.ALL)

geomesa-core/src/main/scala/org/locationtech/geomesa/core/data/AccumuloFeatureSource.scala

@@ -28,6 +28,7 @@ import org.locationtech.geomesa.core.process.query.QueryVisitor
 import org.locationtech.geomesa.core.process.tube.TubeVisitor
 import org.locationtech.geomesa.core.process.unique.AttributeVisitor
 import org.opengis.feature.FeatureVisitor
+import org.opengis.feature.`type`.Name
 import org.opengis.feature.simple.{SimpleFeature, SimpleFeatureType}
 import org.opengis.filter.Filter
 import org.opengis.filter.sort.SortBy
@@ -39,7 +40,7 @@ trait AccumuloAbstractFeatureSource extends AbstractFeatureSource {
   import org.locationtech.geomesa.utils.geotools.Conversions._
 
   val dataStore: AccumuloDataStore
-  val featureName: String
+  val featureName: Name
 
   def addFeatureListener(listener: FeatureListener) {}
 
@@ -69,7 +70,7 @@ trait AccumuloAbstractFeatureSource extends AbstractFeatureSource {
   override def getFeatures(filter: Filter): SimpleFeatureCollection = getFeatures(new Query(getSchema().getTypeName, filter))
 }
 
-class AccumuloFeatureSource(val dataStore: AccumuloDataStore, val featureName: String)
+class AccumuloFeatureSource(val dataStore: AccumuloDataStore, val featureName: Name)
   extends AccumuloAbstractFeatureSource
 
 class AccumuloFeatureCollection(source: SimpleFeatureSource, query: Query)

geomesa-core/src/main/scala/org/locationtech/geomesa/core/data/AccumuloFeatureStore.scala

@@ -26,12 +26,12 @@ import org.geotools.filter.FunctionExpressionImpl
 import org.geotools.geometry.jts.ReferencedEnvelope
 import org.geotools.process.vector.TransformProcess.Definition
 import org.opengis.feature.GeometryAttribute
-import org.opengis.feature.`type`.{AttributeDescriptor, GeometryDescriptor}
+import org.opengis.feature.`type`.{AttributeDescriptor, GeometryDescriptor, Name}
 import org.opengis.feature.simple.{SimpleFeature, SimpleFeatureType}
 import org.opengis.filter.expression.PropertyName
 import org.opengis.filter.identity.FeatureId
 
-class AccumuloFeatureStore(val dataStore: AccumuloDataStore, val featureName: String)
+class AccumuloFeatureStore(val dataStore: AccumuloDataStore, val featureName: Name)
     extends AbstractFeatureStore with AccumuloAbstractFeatureSource {
   override def addFeatures(collection: FeatureCollection[SimpleFeatureType, SimpleFeature]): JList[FeatureId] = {
     writeBounds(collection.getBounds)
@@ -40,7 +40,7 @@ class AccumuloFeatureStore(val dataStore: AccumuloDataStore, val featureName: St
 
   def writeBounds(envelope: ReferencedEnvelope) {
     if(envelope != null)
-      dataStore.writeBounds(featureName, envelope)
+      dataStore.writeBounds(featureName.getLocalPart, envelope)
   }
 }
 

geomesa-core/src/test/scala/org/locationtech/geomesa/core/data/AccumuloDataStoreTest.scala

@@ -31,8 +31,8 @@ import org.geotools.data._
 import org.geotools.data.collection.ListFeatureCollection
 import org.geotools.data.simple.SimpleFeatureStore
 import org.geotools.factory.{CommonFactoryFinder, Hints}
-import org.geotools.feature.DefaultFeatureCollection
 import org.geotools.feature.simple.SimpleFeatureBuilder
+import org.geotools.feature.{DefaultFeatureCollection, NameImpl}
 import org.geotools.filter.text.cql2.CQL
 import org.geotools.geometry.jts.JTSFactoryFinder
 import org.geotools.process.vector.TransformProcess
@@ -430,6 +430,25 @@ class AccumuloDataStoreTest extends Specification {
           "fid-1=testType|POINT (45 49)" mustEqual DataUtilities.encodeFeature(f)
         }
       }
+
+      "handle requests with namespaces" in {
+        // create the data store
+        val ns = "mytestns"
+        val sftName = "namespacetest"
+        val sft = SimpleFeatureTypes.createType(sftName, s"name:String,dtg:Date,*geom:Point:srid=4326")
+        sft.getUserData.put(SF_PROPERTY_START_TIME, "dtg")
+        ds.createSchema(sft)
+
+        val schemaWithoutNs = ds.getSchema(sftName)
+
+        schemaWithoutNs.getName.getNamespaceURI must beNull
+        schemaWithoutNs.getName.getLocalPart mustEqual sftName
+
+        val schemaWithNs = ds.getSchema(new NameImpl(ns, sftName))
+
+        schemaWithNs.getName.getNamespaceURI mustEqual ns
+        schemaWithNs.getName.getLocalPart mustEqual sftName
+      }
     }
 
     "handle IDL correctly" in {
@@ -1050,6 +1069,7 @@ class AccumuloDataStoreTest extends Specification {
         res.head must beGreaterThan(res(1))
       }
     }
+
   }
 
   def buildTestIndexSchemaFormat(featureName: String) = new IndexSchemaBuilder("~").randomNumber(3).constant(featureName).geoHash(0, 3).date("yyyyMMdd").nextPart().geoHash(3, 2).nextPart().id().build()

geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SimpleFeatureTypes.scala

@@ -18,12 +18,12 @@ object SimpleFeatureTypes {
   val TABLE_SPLITTER_OPTIONS = "table.splitter.options"
 
   def createType(nameSpec: String, spec: String): SimpleFeatureType = {
-    val (namespace, name) =
-      nameSpec.split(":").toList match {
-        case n :: Nil => (null, n)
-        case ns :: n :: Nil => (ns, n)
-        case _ => throw new IllegalArgumentException(s"Invalid feature name: $nameSpec")
-      }
+    val nsIndex = nameSpec.lastIndexOf(':')
+    val (namespace, name) = if (nsIndex == -1 || nsIndex == nameSpec.length - 1) {
+      (null, nameSpec)
+    } else {
+      (nameSpec.substring(0, nsIndex), nameSpec.substring(nsIndex + 1))
+    }
 
     val FeatureSpec(attributeSpecs, opts) = parse(spec)
 

geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geotools/SimpleFeatureTypesTest.scala

@@ -23,12 +23,32 @@ class SimpleFeatureTypesTest extends Specification {
         val geomDescriptor = sft.getGeometryDescriptor
         geomDescriptor.getLocalName must be equalTo "geom"
       }
-
       "encode an sft properly" >> {
         SimpleFeatureTypes.encodeType(sft) must be equalTo "id:Integer:index=false,dtg:Date:index=false,*geom:Point:srid=4326:index=true"
       }
     }
 
+    "handle namespaces" >> {
+      "simple ones" >> {
+        val sft = SimpleFeatureTypes.createType("ns:testing", "dtg:Date,*geom:Point:srid=4326")
+        sft.getName.getLocalPart mustEqual "testing"
+        sft.getName.getNamespaceURI mustEqual "ns"
+        sft.getTypeName mustEqual("testing")
+      }
+      "complex ones" >> {
+        val sft = SimpleFeatureTypes.createType("http://geomesa/ns:testing", "dtg:Date,*geom:Point:srid=4326")
+        sft.getName.getLocalPart mustEqual "testing"
+        sft.getName.getNamespaceURI mustEqual "http://geomesa/ns"
+        sft.getTypeName mustEqual("testing")
+      }
+      "invalid ones" >> {
+        val sft = SimpleFeatureTypes.createType("http://geomesa/ns:testing:", "dtg:Date,*geom:Point:srid=4326")
+        sft.getName.getLocalPart mustEqual "http://geomesa/ns:testing:"
+        sft.getName.getNamespaceURI must beNull
+        sft.getTypeName mustEqual("http://geomesa/ns:testing:")
+      }
+    }
+
     "handle empty srid" >> {
       val sft = SimpleFeatureTypes.createType("testing", "id:Integer:index=false,*geom:Point:index=true")
       (sft.getGeometryDescriptor.getCoordinateReferenceSystem must not).beNull