#96. Move Core.groovy up to carnival.core. It is the core Carnival da…

…ta model. Should be as important as the Carnival* objects.
carnival-data · Aug 26, 2022 · e78f1b9 · e78f1b9
1 parent f50afdb
commit e78f1b9
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 11 deletions.
diff --git a/...in/groovy/carnival/core/graph/Core.groovy → ...src/main/groovy/carnival/core/Core.groovy b/...in/groovy/carnival/core/graph/Core.groovy → ...src/main/groovy/carnival/core/Core.groovy
@@ -1,4 +1,4 @@
-package carnival.core.graph
+package carnival.core
 
 
 
@@ -15,7 +15,10 @@ import carnival.graph.VertexModel
 
 
 
-/** */
+/** 
+ * The Core graph model.
+ *
+ */
 class Core {
 
 	///////////////////////////////////////////////////////////////////////////

diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/DataSetDescriptorGraph.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/DataSetDescriptorGraph.groovy
@@ -37,6 +37,7 @@ import carnival.util.MarkdownPrinter
 import carnival.graph.EdgeDefinition
 import carnival.graph.PropertyDefinition
 import carnival.graph.VertexDefinition
+import carnival.core.Core
 
 
 

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
@@ -21,7 +21,7 @@ import carnival.graph.VertexDefinition
 import carnival.graph.PropertyDefinition
 import carnival.graph.PropertyDefinition
 import carnival.graph.EdgeDefinition
-import carnival.core.graph.Core
+import carnival.core.Core
 import carnival.core.Carnival
 
 

diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/GraphMethodBase.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/GraphMethodBase.groovy
@@ -10,6 +10,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
 import carnival.core.util.CoreUtil
 import carnival.graph.Base
 import carnival.graph.VertexDefinition
+import carnival.core.Core
 
 
 

diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/GraphMethodProcess.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/GraphMethodProcess.groovy
@@ -5,7 +5,7 @@ package carnival.core.graph
 import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource
 
-import carnival.core.graph.Core
+import carnival.core.Core
 
 
 

diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/Identifier.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/Identifier.groovy
@@ -24,6 +24,7 @@ import org.apache.tinkerpop.gremlin.structure.Edge
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
 
 import carnival.graph.Base
+import carnival.core.Core
 
 
 

diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/LegacyValidator.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/LegacyValidator.groovy
@@ -14,6 +14,8 @@ 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.Core
+
 
 
 /** */

diff --git a/app/carnival-core/src/main/groovy/test/TestModel.groovy b/app/carnival-core/src/main/groovy/test/TestModel.groovy
@@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory
 import carnival.graph.EdgeDefinition
 import carnival.graph.PropertyDefinition
 import carnival.graph.VertexDefinition
-import carnival.core.graph.Core
+import carnival.core.Core
 
 
 /** */

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
@@ -24,6 +24,7 @@ import carnival.util.FeatureDataType
 
 import carnival.graph.*
 import carnival.core.CarnivalTinker
+import carnival.core.Core
 
 
 

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

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
@@ -6,7 +6,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 import spock.lang.Shared
 
-import carnival.core.graph.Core
+import carnival.core.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
@@ -8,12 +8,13 @@ import spock.lang.Shared
 import org.apache.tinkerpop.gremlin.structure.Graph
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource
 
-import carnival.core.graph.Core
+import carnival.core.Core
 import carnival.graph.Base
 import carnival.graph.VertexModel
 import carnival.graph.VertexDefinition
 import static carnival.core.graph.GraphMethodDynamic.GM
 import carnival.core.CarnivalTinker
+import carnival.core.Core
 
 
 

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
@@ -6,7 +6,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 import spock.lang.Shared
 
-import carnival.core.graph.Core
+import carnival.core.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
@@ -8,11 +8,12 @@ import spock.lang.Shared
 import org.apache.tinkerpop.gremlin.structure.Graph
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource
 
-import carnival.core.graph.Core
+import carnival.core.Core
 import carnival.graph.Base
 import carnival.graph.VertexModel
 import carnival.graph.VertexDefinition
 import carnival.core.CarnivalTinker
+import carnival.core.Core
 
 
 

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
@@ -8,10 +8,11 @@ import spock.lang.Shared
 import org.apache.tinkerpop.gremlin.structure.Graph
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource
 
-import carnival.core.graph.Core
+import carnival.core.Core
 import carnival.graph.Base
 import carnival.graph.VertexModel
 import carnival.core.CarnivalTinker
+import carnival.core.Core
 
 
 

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
@@ -13,6 +13,7 @@ import static org.apache.tinkerpop.gremlin.neo4j.process.traversal.LabelP.of
 
 import carnival.graph.*
 import carnival.core.CarnivalTinker
+import carnival.core.Core
 
 
 

diff --git a/app/carnival-core/src/test/groovy/test/coregraphspec/GraphModel.groovy b/app/carnival-core/src/test/groovy/test/coregraphspec/GraphModel.groovy
@@ -5,7 +5,7 @@ package test.coregraphspec
 import carnival.graph.VertexDefinition
 import carnival.graph.PropertyDefinition
 import carnival.graph.EdgeDefinition
-import carnival.core.graph.Core
+import carnival.core.Core
 import carnival.graph.VertexModel
 import carnival.graph.EdgeModel
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,6 +24,7 @@ import org.apache.tinkerpop.gremlin.structure.Edge
		import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__

		import carnival.graph.Base
		import carnival.core.Core



Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,8 @@ 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.Core
     /** */
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,6 +24,7 @@ import carnival.util.FeatureDataType

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



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 carnival.core.CarnivalTinker
		import carnival.core.Core



Expand Down