[GEOT-5881]: ShapeFileDatastore - Fallback unrecognized attributes to…

… Characters
geotools · Nov 21, 2017 · f216540 · f216540
1 parent 9ce1cd0
commit f216540
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 1 deletion.
diff --git a/modules/plugin/shapefile/src/main/java/org/geotools/data/shapefile/ShapefileDataStore.java b/modules/plugin/shapefile/src/main/java/org/geotools/data/shapefile/ShapefileDataStore.java
@@ -411,7 +411,8 @@ protected static DbaseFileHeader createDbaseHeader(SimpleFeatureType featureType
             } else if (colType == byte[].class) {
                 continue;
             } else {
-                throw new IOException("Unable to write column " +colName + " : " + colType.getName());
+                // Fallback to char columns
+                header.addColumn(colName, 'C', Math.min(254, fieldLen), 0);
             }
         }
 

diff --git a/...es/plugin/shapefile/src/test/java/org/geotools/data/shapefile/ShapefileDataStoreTest.java b/...es/plugin/shapefile/src/test/java/org/geotools/data/shapefile/ShapefileDataStoreTest.java
@@ -56,9 +56,12 @@
 import org.geotools.data.DataUtilities;
 import org.geotools.data.DefaultTransaction;
 import org.geotools.data.FeatureReader;
+import org.geotools.data.FeatureStore;
 import org.geotools.data.FeatureWriter;
 import org.geotools.data.Query;
 import org.geotools.data.Transaction;
+import org.geotools.data.collection.ListFeatureCollection;
+import org.geotools.data.shapefile.dbf.DbaseFileHeader;
 import org.geotools.data.shapefile.files.ShpFileType;
 import org.geotools.data.simple.SimpleFeatureCollection;
 import org.geotools.data.simple.SimpleFeatureIterator;
@@ -75,6 +78,7 @@
 import org.geotools.filter.IllegalFilterException;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
+import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.geotools.util.URLs;
 import org.junit.After;
 import org.junit.Test;
@@ -114,6 +118,21 @@
  */
 public class ShapefileDataStoreTest extends TestCaseSupport {
 
+    // Custom class for testing
+    class CustomTypeClass {
+
+        private int customField;
+
+        CustomTypeClass(int value) {
+            this.customField = value;
+        }
+
+        @Override
+        public String toString() {
+            return Integer.toString(customField);
+        }
+    }
+
     final static String STATE_POP = "shapes/statepop.shp";
     final static String STREAM = "shapes/stream.shp";
     final static String DANISH = "shapes/danish_point.shp";
@@ -309,6 +328,50 @@ public void testSchema() throws Exception {
         shapeDataStore.dispose();
     }
 
+    @Test
+    public void testCustomAttributeInSchema() throws Exception {
+        File shp = org.geotools.test.TestData.file(this, "dumper");
+        shp = new File(shp, "custom.shp");
+        SimpleFeatureTypeBuilder ftBuilder = new SimpleFeatureTypeBuilder();
+        ftBuilder.setName("custom");
+        ftBuilder.setCRS(DefaultGeographicCRS.WGS84);
+        ftBuilder.add("defaultGeom", Point.class, DefaultGeographicCRS.WGS84);
+        ftBuilder.setDefaultGeometry("defaultGeom");
+        ftBuilder.add("custom", CustomTypeClass.class);
+
+        SimpleFeatureType type = ftBuilder.buildFeatureType();
+        URL shapeUrl = URLs.fileToUrl(shp);
+        ShapefileDataStore shapeDataStore = new ShapefileDataStore(shapeUrl);
+
+        // Before the update, this call would have thrown an IOException
+        // due to no mapping found for custom class, failing the test
+        shapeDataStore.createSchema(type);
+
+        ListFeatureCollection collection = new ListFeatureCollection(type);
+        SimpleFeatureBuilder builder = new SimpleFeatureBuilder(type);
+        Object[] values = new Object[] { new GeometryFactory().createPoint(new Coordinate(10, 10)),
+                new CustomTypeClass(20) };
+        builder.addAll(values);
+
+        SimpleFeature feature = builder.buildFeature(type.getTypeName() + '.' + 0);
+        collection.add(feature);
+
+        FeatureStore store = (FeatureStore) shapeDataStore
+                .getFeatureSource(type.getName().getLocalPart());
+        DefaultTransaction transaction = new DefaultTransaction("create");
+        store.setTransaction(transaction);
+        store.addFeatures(collection);
+        transaction.commit();
+        shapeDataStore.dispose();
+
+        // Now read it back
+        shapeDataStore = new ShapefileDataStore(shapeUrl);
+        SimpleFeatureCollection featureCollection = loadFeatures(shapeDataStore);
+        assertTrue(String.class.equals(featureCollection.features().next().getAttribute("custom").getClass()));
+        shapeDataStore.dispose();
+
+    }
+
     @Test
     public void testSpacesInPath() throws Exception {
         URL u = TestData.url(TestCaseSupport.class, "folder with spaces/pointtest.shp");