#96. Move Carnival* classes outside of carnival.core.graph up to carn…

…ival.core. They should be at a higher level as they are the entry-point to the Carnival library.
carnival-data · Aug 26, 2022 · f50afdb · f50afdb
1 parent 7f91d0f
commit f50afdb
Show file tree

Hide file tree

Showing 19 changed files with 47 additions and 27 deletions.
diff --git a/...roovy/carnival/core/graph/Carnival.groovy → ...main/groovy/carnival/core/Carnival.groovy b/...roovy/carnival/core/graph/Carnival.groovy → ...main/groovy/carnival/core/Carnival.groovy
@@ -1,4 +1,4 @@
-package carnival.core.graph
+package carnival.core
 
 
 
@@ -27,6 +27,14 @@ import carnival.graph.PropertyDefinition
 import carnival.graph.VertexDefinition
 import carnival.graph.DynamicVertexDef
 import carnival.graph.VertexBuilder
+import carnival.core.graph.GremlinTrait
+import carnival.core.graph.GraphSchema
+import carnival.core.graph.DefaultGraphSchema
+import carnival.core.graph.GraphValidator
+import carnival.core.graph.GraphValidationError
+import carnival.core.graph.DefaultGraphValidator
+import carnival.core.graph.EdgeConstraint
+import carnival.core.graph.VertexConstraint
 
 
 

diff --git a/.../carnival/core/graph/CarnivalNeo4j.groovy → ...groovy/carnival/core/CarnivalNeo4j.groovy b/.../carnival/core/graph/CarnivalNeo4j.groovy → ...groovy/carnival/core/CarnivalNeo4j.groovy
@@ -1,4 +1,4 @@
-package carnival.core.graph
+package carnival.core
 
 
 
@@ -10,10 +10,6 @@ import groovy.transform.ToString
 import groovy.transform.InheritConstructors
 import groovy.util.logging.Slf4j
 
-import org.reflections.Reflections
-
-import org.apache.commons.configuration.Configuration
-import org.apache.commons.configuration.BaseConfiguration
 import org.apache.commons.configuration.PropertiesConfiguration
 
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal
@@ -25,9 +21,11 @@ import org.apache.tinkerpop.gremlin.structure.Transaction
 import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.apache.tinkerpop.gremlin.structure.Edge
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
-
 import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph
 
+import carnival.core.graph.DefaultGraphSchema
+import carnival.core.graph.DefaultGraphValidator
+
 
 
 

diff --git a/...e/graph/CarnivalNeo4jConfiguration.groovy → ...al/core/CarnivalNeo4jConfiguration.groovy b/...e/graph/CarnivalNeo4jConfiguration.groovy → ...al/core/CarnivalNeo4jConfiguration.groovy
@@ -1,4 +1,4 @@
-package carnival.core.graph
+package carnival.core
 
 
 

diff --git a/...carnival/core/graph/CarnivalTinker.groovy → ...roovy/carnival/core/CarnivalTinker.groovy b/...carnival/core/graph/CarnivalTinker.groovy → ...roovy/carnival/core/CarnivalTinker.groovy
@@ -1,17 +1,11 @@
-package carnival.core.graph
+package carnival.core
 
 
 
 import groovy.transform.ToString
 import groovy.transform.InheritConstructors
 import groovy.util.logging.Slf4j
 
-import org.reflections.Reflections
-
-import org.apache.commons.configuration.Configuration
-import org.apache.commons.configuration.BaseConfiguration
-import org.apache.commons.configuration.PropertiesConfiguration
-
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource
@@ -23,6 +17,9 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.apache.tinkerpop.gremlin.structure.Edge
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
 
+import carnival.core.graph.DefaultGraphSchema
+import carnival.core.graph.DefaultGraphValidator
+
 
 
 

diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/GraphEntityCache.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/GraphEntityCache.groovy
@@ -22,7 +22,7 @@ import carnival.graph.PropertyDefinition
 import carnival.graph.PropertyDefinition
 import carnival.graph.EdgeDefinition
 import carnival.core.graph.Core
-import carnival.core.graph.Carnival
+import carnival.core.Carnival
 
 
 

diff --git a/...rnival/core/graph/CarnivalInitSpec.groovy → ...ovy/carnival/core/CarnivalInitSpec.groovy b/...rnival/core/graph/CarnivalInitSpec.groovy → ...ovy/carnival/core/CarnivalInitSpec.groovy
@@ -1,4 +1,4 @@
-package carnival.core.graph
+package carnival.core
 
 
 import spock.lang.Specification
@@ -11,10 +11,14 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
 import static org.apache.tinkerpop.gremlin.neo4j.process.traversal.LabelP.of
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph
 
+import carnival.core.graph.DefaultGraphSchema
+import carnival.core.graph.DefaultGraphValidator
+import carnival.core.graph.*
+
 
 
 /**
- * gradle test --tests "carnival.core.graph.CarnivalInitSpec"
+ * gradle test --tests "carnival.core.CarnivalInitSpec"
  *
  */
 class CarnivalInitSpec extends Specification {

diff --git a/...e/graph/CarnivalInitializationSpec.groovy → ...al/core/CarnivalInitializationSpec.groovy b/...e/graph/CarnivalInitializationSpec.groovy → ...al/core/CarnivalInitializationSpec.groovy
@@ -1,4 +1,4 @@
-package carnival.core.graph
+package carnival.core
 
 
 
@@ -13,11 +13,12 @@ import static org.apache.tinkerpop.gremlin.neo4j.process.traversal.LabelP.of
 
 import carnival.graph.*
 import test.coregraphspec.GraphModel
+import carnival.core.graph.*
 
 
 
 /**
- * gradle test --tests "carnival.core.graph.CarnivalInitializationSpec"
+ * gradle test --tests "carnival.core.CarnivalInitializationSpec"
  *
  */
 class CarnivalInitializationSpec extends Specification {

diff --git a/...aph/CarnivalNeo4jConfigurationSpec.groovy → ...ore/CarnivalNeo4jConfigurationSpec.groovy b/...aph/CarnivalNeo4jConfigurationSpec.groovy → ...ore/CarnivalNeo4jConfigurationSpec.groovy
@@ -1,4 +1,4 @@
-package carnival.core.graph
+package carnival.core
 
 
 
@@ -7,11 +7,12 @@ import spock.lang.Unroll
 import spock.lang.Shared
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph
 import carnival.graph.VertexBuilder
+import carnival.core.graph.*
 
 
 
 /**
- * gradle test --tests "carnival.core.graph.CarnivalInitializationSpec"
+ * gradle test --tests "carnival.core.CarnivalInitializationSpec"
  *
  */
 class CarnivalNeo4jConfigurationSpec extends Specification {

diff --git a/...nival/core/graph/CarnivalNeo4jSpec.groovy → ...vy/carnival/core/CarnivalNeo4jSpec.groovy b/...nival/core/graph/CarnivalNeo4jSpec.groovy → ...vy/carnival/core/CarnivalNeo4jSpec.groovy
@@ -1,4 +1,4 @@
-package carnival.core.graph
+package carnival.core
 
 
 
@@ -23,11 +23,12 @@ import org.neo4j.configuration.helpers.SocketAddress*/
 
 import carnival.graph.*
 import carnival.core.util.FilesUtil
+import carnival.core.graph.*
 
 
 
 /**
- * gradle test --tests "carnival.core.graph.CarnivalNeo4jSpec"
+ * gradle test --tests "carnival.core.CarnivalNeo4jSpec"
  *
  */
 class CarnivalNeo4jSpec extends Specification {

diff --git a/...y/carnival/core/graph/CarnivalSpec.groovy → .../groovy/carnival/core/CarnivalSpec.groovy b/...y/carnival/core/graph/CarnivalSpec.groovy → .../groovy/carnival/core/CarnivalSpec.groovy
@@ -1,4 +1,4 @@
-package carnival.core.graph
+package carnival.core
 
 
 
@@ -12,11 +12,12 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
 import static org.apache.tinkerpop.gremlin.neo4j.process.traversal.LabelP.of
 
 import carnival.graph.*
+import carnival.core.graph.*
 
 
 
 /**
- * gradle test --tests "carnival.core.graph.CarnivalSpec"
+ * gradle test --tests "carnival.core.CarnivalSpec"
  *
  */
 class CarnivalSpec extends Specification {

diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/DataSetDescriptorGraphSpec.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/DataSetDescriptorGraphSpec.groovy
@@ -23,6 +23,7 @@ import carnival.util.FeatureSetRecipeIngredient
 import carnival.util.FeatureDataType
 
 import carnival.graph.*
+import carnival.core.CarnivalTinker
 
 
 

diff --git a/...re/graph/GremlinGraphValidatorSpec.groovy → ...re/graph/DefaultGraphValidatorSpec.groovy b/...re/graph/GremlinGraphValidatorSpec.groovy → ...re/graph/DefaultGraphValidatorSpec.groovy
@@ -13,6 +13,7 @@ import static org.apache.tinkerpop.gremlin.neo4j.process.traversal.LabelP.of
 
 import carnival.graph.*
 import test.TestModel
+import carnival.core.CarnivalTinker
 
 
 

diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/GraphMethodCallSpec.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/GraphMethodCallSpec.groovy
@@ -8,6 +8,7 @@ import spock.lang.Shared
 
 import carnival.core.graph.Core
 import carnival.graph.VertexModel
+import carnival.core.CarnivalTinker
 
 
 

diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/GraphMethodDynamicSpec.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/GraphMethodDynamicSpec.groovy
@@ -13,6 +13,7 @@ import carnival.graph.Base
 import carnival.graph.VertexModel
 import carnival.graph.VertexDefinition
 import static carnival.core.graph.GraphMethodDynamic.GM
+import carnival.core.CarnivalTinker
 
 
 

diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/GraphMethodProcessSpec.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/GraphMethodProcessSpec.groovy
@@ -8,6 +8,7 @@ import spock.lang.Shared
 
 import carnival.core.graph.Core
 import carnival.graph.VertexModel
+import carnival.core.CarnivalTinker
 
 
 

diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/GraphMethodSpec.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/GraphMethodSpec.groovy
@@ -12,6 +12,7 @@ import carnival.core.graph.Core
 import carnival.graph.Base
 import carnival.graph.VertexModel
 import carnival.graph.VertexDefinition
+import carnival.core.CarnivalTinker
 
 
 

diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/GraphMethodsSpec.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/GraphMethodsSpec.groovy
@@ -11,6 +11,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
 import carnival.core.graph.Core
 import carnival.graph.Base
 import carnival.graph.VertexModel
+import carnival.core.CarnivalTinker
 
 
 

diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/GraphModelExtensionSpec.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/GraphModelExtensionSpec.groovy
@@ -12,6 +12,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
 import static org.apache.tinkerpop.gremlin.neo4j.process.traversal.LabelP.of
 
 import carnival.graph.*
+import carnival.core.CarnivalTinker
 
 
 

diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/LegacyGraphSpec.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/LegacyGraphSpec.groovy
@@ -12,11 +12,12 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
 import static org.apache.tinkerpop.gremlin.neo4j.process.traversal.LabelP.of
 
 import carnival.graph.*
+import carnival.core.CarnivalTinker
 
 
 
 /**
- * gradle test --tests "carnival.core.graph.CarnivalSpec"
+ * gradle test --tests "carnival.core.CarnivalSpec"
  *
  */
 class LegacyGraphSpec extends Specification {
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		package carnival.core.graph
		package carnival.core



Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,6 +23,7 @@ import carnival.util.FeatureSetRecipeIngredient
		import carnival.util.FeatureDataType

		import carnival.graph.*
		import carnival.core.CarnivalTinker



Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,6 +13,7 @@ import static org.apache.tinkerpop.gremlin.neo4j.process.traversal.LabelP.of

		import carnival.graph.*
		import test.TestModel
		import carnival.core.CarnivalTinker



Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,6 +8,7 @@ import spock.lang.Shared

		import carnival.core.graph.Core
		import carnival.graph.VertexModel
		import carnival.core.CarnivalTinker



Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,6 +12,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
		import static org.apache.tinkerpop.gremlin.neo4j.process.traversal.LabelP.of

		import carnival.graph.*
		import carnival.core.CarnivalTinker



Expand Down