issues/1790: Make it possible to use standalone cassandra (#25)

issues/1790: Make it possible to use standalone cassandra

Author: sbespalov

strongbox-db-import/pom.xml

@@ -53,7 +53,9 @@
                         </goals>
                         <configuration>
                             <jvmArguments>-Xmx1024m</jvmArguments>
-                            <arguments>--strongbox.db.janus-graph.storage-root=${project.build.directory}/db</arguments>
+                            <arguments> 
+                              --strongbox.dbimport.root=${project.build.directory}
+                            </arguments>
                         </configuration>
                     </execution>
                 </executions>

strongbox-db-import/src/main/java/org/carlspring/strongbox/db/schema/SchemaConfig.java

@@ -1,5 +1,6 @@
-package org.carlspring.strongbox.db;
+package org.carlspring.strongbox.dbimport;
 
+import org.janusgraph.core.JanusGraph;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
@@ -15,6 +16,8 @@ public class Application
     public static void main(String[] args)
     {
         ConfigurableApplicationContext ctx = SpringApplication.run(Application.class, args);
+        ctx.getBean(JanusGraph.class);
+        
         SpringApplication.exit(ctx, () -> 0);
     }
 }

strongbox-db-import/src/main/java/org/carlspring/strongbox/db/server/EmbeddedDbServerConfiguration.java

@@ -0,0 +1,83 @@
+package org.carlspring.strongbox.dbimport;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+import org.carlspring.strongbox.db.schema.StrongboxSchema;
+import org.janusgraph.core.JanusGraph;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.strongbox.db.server.CassandraEmbeddedConfiguration;
+import org.strongbox.db.server.CassandraEmbeddedProperties;
+import org.strongbox.db.server.JanusGraphConfiguration;
+import org.strongbox.db.server.JanusGraphProperties;
+import org.strongbox.db.server.JanusGraphServer;
+import org.strongbox.db.server.JanusGraphWithEmbeddedCassandra;
+
+/**
+ * @author Przemyslaw Fusik
+ * @author sbespalov
+ */
+@Configuration
+@ConfigurationPropertiesScan
+class EmbeddedDbServerConfiguration
+{
+
+    @Bean
+    JanusGraphServer embeddedDbServer(CassandraEmbeddedConfiguration cassandraConfiguration,
+                                      JanusGraphConfiguration janusGraphConfiguration)
+        throws IOException
+    {
+        return new JanusGraphWithEmbeddedCassandra(cassandraConfiguration, janusGraphConfiguration);
+    }
+
+    private void extractConfigurationFile(String rootFolder,
+                                          String configFileName)
+        throws IOException
+    {
+        try (InputStream in = JanusGraphWithEmbeddedCassandra.class.getResourceAsStream(String.format("/etc/conf/%s", configFileName)))
+        {
+            Path configRoot = Paths.get(rootFolder).resolve("etc").resolve("conf");
+            Files.createDirectories(configRoot);
+            Files.copy(in,
+                       configRoot.resolve(configFileName),
+                       StandardCopyOption.REPLACE_EXISTING);
+        }
+    }
+
+    @Bean
+    JanusGraph janusGraph(JanusGraphServer server)
+        throws Exception
+    {
+        return new StrongboxSchema().createSchema(server.getJanusGraph());
+    }
+
+    @Bean
+    JanusGraphProperties dbImportJanusGraphProperties(@Value("${strongbox.dbimport.root}") String dbImportRoot)
+        throws IOException
+    {
+        extractConfigurationFile(dbImportRoot, "janusgraph-cassandra.properties");
+        Path configFilePath = Paths.get(dbImportRoot).resolve("etc").resolve("conf").resolve("janusgraph-cassandra.properties");
+
+        return new JanusGraphProperties( String.format("file:%s", configFilePath.toAbsolutePath().toString()));
+    }
+
+    @Bean
+    CassandraEmbeddedProperties dbImportCassandraEmbeddedProperties(@Value("${strongbox.dbimport.root}") String dbImportRoot)
+        throws IOException
+    {
+        extractConfigurationFile(dbImportRoot, "cassandra.yaml");
+        Path rootPath = Paths.get(dbImportRoot).toAbsolutePath();
+        Path configFilePath = rootPath.resolve("etc").resolve("conf").resolve("cassandra.yaml");
+        Path storageRootPath = rootPath.resolve("db");
+
+        return new CassandraEmbeddedProperties(storageRootPath.toString(), String.format("file:%s", configFilePath.toString()));
+    }
+
+}

strongbox-db-import/src/main/java/org/carlspring/strongbox/db/Application.java renamed to strongbox-db-import/src/main/java/org/carlspring/strongbox/dbimport/Application.java

@@ -2,14 +2,5 @@ spring:
   main:
     web-application-type: NONE
 strongbox:
-  db:
-    janus-graph:
-      #TODO: [First start] randomize
-      storage-username: cassandra
-      storage-password: cassandra
-      storage-host: 127.0.0.1
-      storage-port: 49142
-      storage-root: ./target/db
-logging:
-  level:
-    liquibase: INFO
+  dbimport:
+    root: ./target

strongbox-db-import/src/main/java/org/carlspring/strongbox/dbimport/EmbeddedDbServerConfiguration.java

@@ -95,9 +95,11 @@ public class StrongboxSchema
 
     private static final Logger logger = LoggerFactory.getLogger(StrongboxSchema.class);
 
-    public void createSchema(JanusGraph jg)
+    public JanusGraph createSchema(JanusGraph jg)
         throws InterruptedException
     {
+        logger.info("Apply schema changes.");
+        
         JanusGraphManagement jgm = jg.openManagement();
         try
         {
@@ -161,6 +163,10 @@ public void createSchema(JanusGraph jg)
         {
             jgm.rollback();
         }
+        
+        logger.info("Schema changes applied.");
+        
+        return jg;
     }
 
     protected void enableIndexes(JanusGraphManagement jgm,
@@ -196,7 +202,7 @@ protected Map<String, String> createRelationIndexes(JanusGraph jg,
         Map<String, String> result = new HashMap<>();
 
         String name = ARTIFACT_GROUP_HAS_TAGGED_ARTIFACTS + "By" + StringUtils.capitalize(TAG_NAME);
-        if (!jgm.containsGraphIndex(name))
+        if (!jgm.containsRelationIndex(jgm.getEdgeLabel(ARTIFACT_GROUP_HAS_TAGGED_ARTIFACTS), name))
         {
             jgm.buildEdgeIndex(jgm.getEdgeLabel(ARTIFACT_GROUP_HAS_TAGGED_ARTIFACTS),
                                name,

strongbox-db-import/src/main/resources/application.yml

@@ -3,9 +3,8 @@
 public interface CassandraEmbeddedConfiguration
 {
 
-    Integer getPort();
+    String getStorageRoot();
 
-    String getStorageFolder();
-
-    String getCassandraConfigLoaderClassName();
+    String getConfigLocation();
+    
 }