Closes #92

carnival-data · May 12, 2022 · ba6a6e7 · ba6a6e7
1 parent c5d3fba
commit ba6a6e7
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 16 deletions.
diff --git a/app/carnival-core/src/main/groovy/carnival/core/cli/CarnivalLocalDirInit.groovy b/app/carnival-core/src/main/groovy/carnival/core/cli/CarnivalLocalDirInit.groovy
@@ -2,7 +2,7 @@ package carnival.core.cli
 
 
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 
 
 

diff --git a/...main/groovy/carnival/util/Defaults.groovy → ...oovy/carnival/core/config/Defaults.groovy b/...main/groovy/carnival/util/Defaults.groovy → ...oovy/carnival/core/config/Defaults.groovy
@@ -1,4 +1,4 @@
-package carnival.util
+package carnival.core.config
 
 
 

diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraph.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraph.groovy
@@ -22,7 +22,7 @@ import org.apache.tinkerpop.gremlin.structure.Edge
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
 import org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.graph.EdgeDefTrait
 import carnival.graph.PropertyDefTrait
 import carnival.graph.VertexDefTrait

diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphNeo4j.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphNeo4j.groovy
@@ -25,7 +25,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
 
 import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 
 
 

diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphSchema.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphSchema.groovy
@@ -21,7 +21,7 @@ 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.util.Defaults
+import carnival.core.config.Defaults
 import carnival.graph.EdgeDefTrait
 import carnival.graph.PropertyDefTrait
 import carnival.graph.VertexDefTrait

diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphTinker.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphTinker.groovy
@@ -23,7 +23,7 @@ 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.util.Defaults
+import carnival.core.config.Defaults
 
 
 

diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/GraphSchema.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/GraphSchema.groovy
@@ -22,7 +22,7 @@ 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.util.Defaults
+import carnival.core.config.Defaults
 
 import carnival.graph.EdgeDefTrait
 import carnival.graph.PropertyDefTrait

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
@@ -23,7 +23,7 @@ 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.util.Defaults
+import carnival.core.config.Defaults
 import carnival.graph.Base
 
 

diff --git a/app/carnival-core/src/main/groovy/carnival/core/vine/DataTableVineMethod.groovy b/app/carnival-core/src/main/groovy/carnival/core/vine/DataTableVineMethod.groovy
@@ -5,7 +5,7 @@ package carnival.core.vine
 import groovy.util.logging.Slf4j
 import org.apache.commons.codec.digest.DigestUtils
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.core.util.CoreUtil
 import carnival.util.GenericDataTable
 import carnival.util.MappedDataTable

diff --git a/app/carnival-core/src/main/groovy/carnival/core/vine/GenericDataTableVineMethod.groovy b/app/carnival-core/src/main/groovy/carnival/core/vine/GenericDataTableVineMethod.groovy
@@ -5,7 +5,7 @@ package carnival.core.vine
 import groovy.util.logging.Slf4j
 import org.apache.commons.codec.digest.DigestUtils
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.core.util.CoreUtil
 import carnival.util.GenericDataTable
 import carnival.util.MappedDataTable

diff --git a/app/carnival-core/src/main/groovy/carnival/core/vine/JsonVineMethod.groovy b/app/carnival-core/src/main/groovy/carnival/core/vine/JsonVineMethod.groovy
@@ -5,7 +5,7 @@ package carnival.core.vine
 import groovy.util.logging.Slf4j
 import org.apache.commons.codec.digest.DigestUtils
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.core.util.CoreUtil
 
 

diff --git a/app/carnival-core/src/main/groovy/carnival/core/vine/MappedDataTableVineMethod.groovy b/app/carnival-core/src/main/groovy/carnival/core/vine/MappedDataTableVineMethod.groovy
@@ -5,7 +5,7 @@ package carnival.core.vine
 import groovy.util.logging.Slf4j
 import org.apache.commons.codec.digest.DigestUtils
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.core.util.CoreUtil
 import carnival.util.GenericDataTable
 import carnival.util.MappedDataTable

diff --git a/app/carnival-core/src/main/groovy/carnival/core/vine/VineMethod.groovy b/app/carnival-core/src/main/groovy/carnival/core/vine/VineMethod.groovy
@@ -5,7 +5,7 @@ package carnival.core.vine
 import groovy.util.logging.Slf4j
 import org.apache.commons.codec.digest.DigestUtils
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.core.util.CoreUtil
 
 

diff --git a/.../groovy/carnival/util/DefaultsSpec.groovy → .../carnival/core/config/DefaultsSpec.groovy b/.../groovy/carnival/util/DefaultsSpec.groovy → .../carnival/core/config/DefaultsSpec.groovy
@@ -1,4 +1,4 @@
-package carnival.util
+package carnival.core.config
 
 
 import groovy.sql.*
@@ -97,6 +97,18 @@ class DefaultsSpec extends Specification {
         then:
         Defaults.getDataDirectoryPath() == "${existingDataDir}_"
         Defaults.getTargetDirectoryPath() == existingTargetDir
+
+        cleanup:
+        m = [
+            carnival: [
+                directories: [
+                    data: [
+                        root: "${existingDataDir}".toString()
+                    ]
+                ]
+            ]
+        ]
+        Defaults.setConfigData(m)
     }
 
 

diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphNeo4jSpec.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphNeo4jSpec.groovy
@@ -18,7 +18,7 @@ import org.neo4j.configuration.connectors.BoltConnector
 import org.neo4j.configuration.helpers.SocketAddress*/
 
 import carnival.graph.*
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 
 
 

diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphSpecification.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphSpecification.groovy
@@ -7,7 +7,7 @@ import spock.lang.Shared
 
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import static carnival.util.AppUtil.sysPropFalse
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,7 @@ package carnival.core.cli



		import carnival.util.Defaults
		import carnival.core.config.Defaults



Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		package carnival.util
		package carnival.core.config



Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,7 +25,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__

		import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph

		import carnival.util.Defaults
		import carnival.core.config.Defaults



Expand Down