Conduit is dead, long live dataline

conduit-api/build.gradle → dataline-api/build.gradle

@@ -3,16 +3,16 @@ plugins {
     id "java-library"
 }
 
-def specFile = "$projectDir/src/main/openapi/conduit.yaml".toString()
+def specFile = "$projectDir/src/main/openapi/config.yaml".toString()
 
 openApiGenerate {
     generatorName = "jaxrs-spec"
     inputSpec = specFile
     outputDir = "$buildDir/generated".toString()
 
-    apiPackage = "io.dataline.conduit.api"
-    invokerPackage = "io.dataline.conduit.api.invoker"
-    modelPackage = "io.dataline.conduit.api.model"
+    apiPackage = "io.dataline.api"
+    invokerPackage = "io.dataline.api.invoker"
+    modelPackage = "io.dataline.api.model"
 
     generateApiDocumentation = false
 

conduit-api/src/main/openapi/conduit.yaml → dataline-api/src/main/openapi/config.yaml

@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   description: |
-    Conduit API
+    Dataline API
     [https://dataline.io](https://dataline.io).
 
     This API is a collection HTTP RPC-style methods. While it is not a REST API, those familiar with REST should find the conventions of this API recognizable.
@@ -20,7 +20,7 @@ info:
       * Adding new HTTP endpoints.
 
   version: "1.0.0-oas3"
-  title: Conduit Configuration API
+  title: Dataline Configuration API
   contact:
     email: [email protected]
   license:

conduit-commons/src/main/java/io/dataline/conduit/commons/HelloWorld.java → dataline-commons/src/main/java/io/dataline/commons/HelloWorld.java

@@ -1,4 +1,4 @@
-package io.dataline.conduit.commons;
+package io.dataline.commons;
 
 import com.google.common.base.Strings;
 

conduit-commons/src/test/java/io/dataline/conduit/commons/HelloWorldTest.java → dataline-commons/src/test/java/io/dataline/commons/HelloWorldTest.java

@@ -1,4 +1,4 @@
-package io.dataline.conduit.commons;
+package io.dataline.commons;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

conduit-config-persistence/build.gradle → dataline-config-persistence/build.gradle

@@ -3,7 +3,7 @@ plugins {
     id "com.diffplug.spotless" version "5.1.1"
 }
 
-group 'io.dataline.conduit'
+group 'io.dataline'
 version '0.1.0'
 
 repositories {
@@ -24,6 +24,6 @@ dependencies {
     compile group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.9.8"
     compile group: "com.networknt", name: "json-schema-validator", version: "1.0.42"
 
-    implementation project(':conduit-config')
+    implementation project(':dataline-config')
 
 }

conduit-config-persistence/src/main/java/io/dataline/conduit/persistence/ConfigPersistence.java → dataline-config-persistence/src/main/java/io/dataline/config/persistence/ConfigPersistence.java

@@ -1,4 +1,4 @@
-package io.dataline.conduit.persistence;
+package io.dataline.config.persistence;
 
 import java.util.Set;
 

conduit-config-persistence/src/main/java/io/dataline/conduit/persistence/ConfigPersistenceImpl.java → dataline-config-persistence/src/main/java/io/dataline/config/persistence/ConfigPersistenceImpl.java

@@ -1,10 +1,13 @@
-package io.dataline.conduit.persistence;
+package io.dataline.config.persistence;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.networknt.schema.*;
-import io.dataline.conduit.conduit_config.ConfigSchema;
-import io.dataline.conduit.conduit_config.StandardScheduleConfiguration;
+import com.networknt.schema.JsonSchema;
+import com.networknt.schema.JsonSchemaFactory;
+import com.networknt.schema.SchemaValidatorsConfig;
+import com.networknt.schema.SpecVersion;
+import com.networknt.schema.ValidationMessage;
+import io.dataline.config.ConfigSchema;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -16,7 +19,7 @@
 
 public class ConfigPersistenceImpl implements ConfigPersistence {
   private static final String CONFIG_STORAGE_ROOT = "data/config/";
-  private static final String CONFIG_SCHEMA_ROOT = "conduit-config/src/main/resources/json/";
+  private static final String CONFIG_SCHEMA_ROOT = "dataline-config/src/main/resources/json/";
 
   private final ObjectMapper objectMapper;
   private final SchemaValidatorsConfig schemaValidatorsConfig;

conduit-config-persistence/src/main/java/io/dataline/conduit/persistence/PersistenceConfigType.java → dataline-config-persistence/src/main/java/io/dataline/config/persistence/PersistenceConfigType.java

@@ -1,4 +1,4 @@
-package io.dataline.conduit.persistence;
+package io.dataline.config.persistence;
 
 public enum PersistenceConfigType {
   SOURCE_CONNECTION_CONFIGURATION,

conduit-config/build.gradle → dataline-config/build.gradle

@@ -1,4 +1,4 @@
-group 'io.dataline.conduit'
+group 'io.dataline'
 version '0.1.0'
 
 // todo: make sure we use the non-deprecated version of this.
@@ -31,5 +31,5 @@ dependencies {
 }
 
 jsonSchema2Pojo {
-    targetPackage = 'io.dataline.conduit.conduit_config'
+    targetPackage = 'io.dataline.config'
 }

conduit-config/src/main/java/io/dataline/conduit/conduit_config/ConfigSchema.java → dataline-config/src/main/java/io/dataline/config/ConfigSchema.java

@@ -1,4 +1,4 @@
-package io.dataline.conduit.conduit_config;
+package io.dataline.config;
 
 public enum ConfigSchema {
   SOURCE_CONNECTION_CONFIGURATION("SourceConnectionConfiguration.json"),

conduit-server/build.gradle → dataline-server/build.gradle

@@ -24,10 +24,11 @@ dependencies {
     compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.9.8");
     compile(group: "com.networknt", name: "json-schema-validator", version: "1.0.42");
 
-    implementation project(':conduit-api')
-    implementation project(':conduit-config')
+    implementation project(':dataline-api')
+    implementation project(':dataline-commons')
+    implementation project(':dataline-config')
 }
 
 application {
-    mainClass = 'io.dataline.conduit.server.ServerApp'
+    mainClass = 'io.dataline.server.ServerApp'
 }

conduit-server/src/main/java/io/dataline/conduit/server/ServerApp.java → dataline-server/src/main/java/io/dataline/server/ServerApp.java

@@ -1,6 +1,6 @@
-package io.dataline.conduit.server;
+package io.dataline.server;
 
-import io.dataline.conduit.server.apis.ConduitConfigurationApi;
+import io.dataline.server.apis.ConfigurationApi;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -17,11 +17,11 @@ public void start() throws Exception {
 
     ServletContextHandler handler = new ServletContextHandler();
 
-    ResourceConfig rc = new ResourceConfig().registerClasses(ConduitConfigurationApi.class);
+    ResourceConfig rc = new ResourceConfig().registerClasses(ConfigurationApi.class);
 
-    ServletHolder conduitServlet = new ServletHolder(new ServletContainer(rc));
+    ServletHolder configServlet = new ServletHolder(new ServletContainer(rc));
 
-    handler.addServlet(conduitServlet, "/api/v1/*");
+    handler.addServlet(configServlet, "/api/v1/*");
 
     server.setHandler(handler);
 

conduit-server/src/main/java/io/dataline/conduit/server/apis/ConduitConfigurationApi.java → dataline-server/src/main/java/io/dataline/server/apis/ConfigurationApi.java

@@ -1,11 +1,11 @@
-package io.dataline.conduit.server.apis;
+package io.dataline.server.apis;
 
-import io.dataline.conduit.api.model.*;
+import io.dataline.api.model.*;
 import javax.validation.Valid;
 import javax.ws.rs.Path;
 
 @Path("/v1")
-public class ConduitConfigurationApi implements io.dataline.conduit.api.V1Api {
+public class ConfigurationApi implements io.dataline.api.V1Api {
 
   @Override
   public ConnectionRead createConnection(@Valid ConnectionCreate connectionCreate) {

conduit-server/src/test/java/io/dataline/conduit/server/ServerAppTest.java → dataline-server/src/test/java/io/dataline/server/ServerAppTest.java

@@ -1,4 +1,4 @@
-package io.dataline.conduit.server;
+package io.dataline.server;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;