Fixes #1088

titan-core/src/main/java/com/thinkaurelius/titan/core/schema/DefaultSchemaMaker.java

@@ -1,5 +1,6 @@
 package com.thinkaurelius.titan.core.schema;
 
+import com.thinkaurelius.titan.core.Cardinality;
 import com.thinkaurelius.titan.core.EdgeLabel;
 import com.thinkaurelius.titan.core.PropertyKey;
 import com.thinkaurelius.titan.core.VertexLabel;
@@ -25,7 +26,15 @@ public interface DefaultSchemaMaker {
      * @return A new edge label
      * @throws IllegalArgumentException if the name is already in use or if other configured values are invalid.
      */
-    public EdgeLabel makeEdgeLabel(EdgeLabelMaker factory);
+    public default EdgeLabel makeEdgeLabel(EdgeLabelMaker factory) {
+        return factory.directed().make();
+    }
+
+    /**
+     *
+     * @return the default cardinality of a property if created for the given key
+     */
+    public Cardinality defaultPropertyCardinality(String key);
 
     /**
      * Creates a new property key with default settings against the provided {@link PropertyKeyMaker}.
@@ -34,7 +43,9 @@ public interface DefaultSchemaMaker {
      * @return A new property key
      * @throws IllegalArgumentException if the name is already in use or if other configured values are invalid.
      */
-    public PropertyKey makePropertyKey(PropertyKeyMaker factory);
+    public default PropertyKey makePropertyKey(PropertyKeyMaker factory) {
+        return factory.cardinality(defaultPropertyCardinality(factory.getName())).dataType(Object.class).make();
+    }
 
     /**
      * Creates a new vertex label with the default settings against the provided {@link VertexLabelMaker}.
@@ -43,7 +54,9 @@ public interface DefaultSchemaMaker {
      * @return A new vertex label
      * @throws IllegalArgumentException if the name is already in use or if other configured values are invalid.
      */
-    public VertexLabel makeVertexLabel(VertexLabelMaker factory);
+    public default VertexLabel makeVertexLabel(VertexLabelMaker factory) {
+        return factory.make();
+    }
 
     /**
      * Whether to ignore undefined types occurring in a query.
@@ -54,4 +67,6 @@ public interface DefaultSchemaMaker {
      */
     public boolean ignoreUndefinedQueryTypes();
 
+
+
 }

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/configuration/GraphDatabaseConfiguration.java

@@ -10,7 +10,7 @@
 import com.thinkaurelius.titan.diskstorage.StandardIndexProvider;
 import com.thinkaurelius.titan.diskstorage.StandardStoreManager;
 import com.thinkaurelius.titan.diskstorage.keycolumnvalue.ttl.TTLKCVSManager;
-import com.thinkaurelius.titan.graphdb.tinkerpop.BlueprintsDefaultSchemaMaker;
+import com.thinkaurelius.titan.graphdb.tinkerpop.TitanDefaultSchemaMaker;
 import com.thinkaurelius.titan.graphdb.tinkerpop.Tp3DefaultSchemaMaker;
 import com.thinkaurelius.titan.graphdb.database.management.ManagementSystem;
 import com.thinkaurelius.titan.graphdb.types.typemaker.DisableDefaultSchemaMaker;
@@ -247,7 +247,7 @@ public class GraphDatabaseConfiguration {
     public static final ConfigOption<String> AUTO_TYPE = new ConfigOption<String>(SCHEMA_NS,"default",
             "Configures the DefaultSchemaMaker to be used by this graph. If set to 'none', automatic schema creation is disabled. " +
                     "Defaults to a blueprints compatible schema maker with MULTI edge labels and SINGLE property keys",
-            ConfigOption.Type.MASKABLE, "blueprints" , new Predicate<String>() {
+            ConfigOption.Type.MASKABLE, "default" , new Predicate<String>() {
         @Override
         public boolean apply(@Nullable String s) {
             if (s==null) return false;
@@ -263,7 +263,7 @@ public boolean apply(@Nullable String s) {
 
     private static final Map<String, DefaultSchemaMaker> preregisteredAutoType = new HashMap<String, DefaultSchemaMaker>() {{
         put("none", DisableDefaultSchemaMaker.INSTANCE);
-        put("blueprints", BlueprintsDefaultSchemaMaker.INSTANCE);
+        put("default", TitanDefaultSchemaMaker.INSTANCE);
         put("tp3", Tp3DefaultSchemaMaker.INSTANCE);
     }};
 

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/BlueprintsDefaultSchemaMaker.java → titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/TitanDefaultSchemaMaker.java

@@ -11,27 +11,18 @@
  *
  * @author Matthias Broecheler (me@matthiasb.com)
  */
-public class BlueprintsDefaultSchemaMaker implements DefaultSchemaMaker {
+public class TitanDefaultSchemaMaker implements DefaultSchemaMaker {
 
-    public static final DefaultSchemaMaker INSTANCE = new BlueprintsDefaultSchemaMaker();
+    public static final DefaultSchemaMaker INSTANCE = new TitanDefaultSchemaMaker();
 
-    private BlueprintsDefaultSchemaMaker() {
+    private TitanDefaultSchemaMaker() {
     }
 
     @Override
-    public EdgeLabel makeEdgeLabel(EdgeLabelMaker factory) {
-        return factory.directed().make();
+    public Cardinality defaultPropertyCardinality(String key) {
+        return Cardinality.SINGLE;
     }
 
-    @Override
-    public PropertyKey makePropertyKey(PropertyKeyMaker factory) {
-        return factory.dataType(Object.class).make();
-    }
-
-    @Override
-    public VertexLabel makeVertexLabel(VertexLabelMaker factory) {
-        return factory.make();
-    }
 
     @Override
     public boolean ignoreUndefinedQueryTypes() {

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/TitanFeatures.java

@@ -4,6 +4,7 @@
 import com.thinkaurelius.titan.diskstorage.keycolumnvalue.StoreFeatures;
 import com.thinkaurelius.titan.graphdb.configuration.GraphDatabaseConfiguration;
 import com.thinkaurelius.titan.graphdb.database.StandardTitanGraph;
+import com.thinkaurelius.titan.graphdb.transaction.StandardTitanTx;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
@@ -147,9 +148,9 @@ private class TitanVertexFeatures implements VertexFeatures {
 
         @Override
         public VertexProperty.Cardinality getCardinality(final String key) {
-            TitanTransaction tx = TitanFeatures.this.graph.newTransaction();
+            StandardTitanTx tx = (StandardTitanTx)TitanFeatures.this.graph.newTransaction();
             try {
-                if (!tx.containsPropertyKey(key)) return VertexProperty.Cardinality.list; //DEFAULT
+                if (!tx.containsPropertyKey(key)) return tx.getConfiguration().getAutoSchemaMaker().defaultPropertyCardinality(key).convert();
                 return tx.getPropertyKey(key).cardinality().convert();
             } finally {
                 tx.rollback();

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/Tp3DefaultSchemaMaker.java

@@ -20,18 +20,8 @@ private Tp3DefaultSchemaMaker() {
     }
 
     @Override
-    public EdgeLabel makeEdgeLabel(EdgeLabelMaker factory) {
-        return factory.directed().make();
-    }
-
-    @Override
-    public PropertyKey makePropertyKey(PropertyKeyMaker factory) {
-        return factory.cardinality(Cardinality.LIST).dataType(Object.class).make();
-    }
-
-    @Override
-    public VertexLabel makeVertexLabel(VertexLabelMaker factory) {
-        return factory.make();
+    public Cardinality defaultPropertyCardinality(String key) {
+        return Cardinality.LIST;
     }
 
     @Override

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/typemaker/DisableDefaultSchemaMaker.java

@@ -22,6 +22,11 @@ public EdgeLabel makeEdgeLabel(EdgeLabelMaker factory) {
         throw new IllegalArgumentException("Edge Label with given name does not exist: " + factory.getName());
     }
 
+    @Override
+    public Cardinality defaultPropertyCardinality(String key) {
+        return Cardinality.SINGLE;
+    }
+
     @Override
     public PropertyKey makePropertyKey(PropertyKeyMaker factory) {
         throw new IllegalArgumentException("Property Key with given name does not exist: " + factory.getName());