Configuration moved to 'app' module

connector-app/src/main/java/cz/senslog/connector/app/Application.java

@@ -1,8 +1,8 @@
 package cz.senslog.connector.app;
 
 import cz.senslog.connector.app.config.*;
-import cz.senslog.connector.config.api.ConfigurationService;
-import cz.senslog.connector.config.api.FileConfigurationService;
+import cz.senslog.connector.app.config.api.ConfigurationService;
+import cz.senslog.connector.app.config.api.FileConfigurationService;
 import cz.senslog.connector.fetch.ConnectorFetch;
 import cz.senslog.connector.model.converter.ModelConverterProvider;
 import cz.senslog.connector.push.ConnectorPush;

connector-common/src/main/java/cz/senslog/connector/config/ConfigurationServiceImpl.java → connector-app/src/main/java/cz/senslog/connector/app/config/ConfigurationServiceImpl.java

@@ -1,6 +1,6 @@
-package cz.senslog.connector.config;
+package cz.senslog.connector.app.config;
 
-import cz.senslog.connector.config.api.ConfigurationService;
+import cz.senslog.connector.app.config.api.ConfigurationService;
 import cz.senslog.connector.config.model.ConnectorDescriptor;
 import cz.senslog.connector.config.model.DefaultConfig;
 

connector-app/src/main/java/cz/senslog/connector/app/config/ConnectorBuilder.java

@@ -1,8 +1,8 @@
 package cz.senslog.connector.app.config;
 
-import cz.senslog.connector.config.api.ConfigurationService;
-import cz.senslog.connector.config.model.DefaultConfig;
+import cz.senslog.connector.app.config.api.ConfigurationService;
 import cz.senslog.connector.config.model.ConnectorDescriptor;
+import cz.senslog.connector.config.model.DefaultConfig;
 import cz.senslog.connector.fetch.api.ConnectorFetchProvider;
 import cz.senslog.connector.fetch.api.ConnectorFetcher;
 import cz.senslog.connector.model.api.AbstractModel;

connector-common/src/main/java/cz/senslog/connector/config/DatabaseBuilderImpl.java → connector-app/src/main/java/cz/senslog/connector/app/config/DatabaseBuilderImpl.java

@@ -1,7 +1,8 @@
-package cz.senslog.connector.config;
+package cz.senslog.connector.app.config;
 
-import cz.senslog.connector.config.api.DatabaseBuilder;
-import cz.senslog.connector.config.api.DatabaseConfigurationService;
+
+import cz.senslog.connector.app.config.api.DatabaseBuilder;
+import cz.senslog.connector.app.config.api.DatabaseConfigurationService;
 
 /**
  * The class {@code DatabaseBuilderImpl} represents an implementation of {@link DatabaseBuilder}.

connector-common/src/main/java/cz/senslog/connector/config/DatabaseConfigurationServiceImpl.java → connector-app/src/main/java/cz/senslog/connector/app/config/DatabaseConfigurationServiceImpl.java

@@ -1,6 +1,6 @@
-package cz.senslog.connector.config;
+package cz.senslog.connector.app.config;
 
-import cz.senslog.connector.config.api.DatabaseConfigurationService;
+import cz.senslog.connector.app.config.api.DatabaseConfigurationService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

connector-common/src/main/java/cz/senslog/connector/config/FileBuilderImpl.java → connector-app/src/main/java/cz/senslog/connector/app/config/FileBuilderImpl.java

@@ -1,7 +1,7 @@
-package cz.senslog.connector.config;
+package cz.senslog.connector.app.config;
 
-import cz.senslog.connector.config.api.FileBuilder;
-import cz.senslog.connector.config.api.FileConfigurationService;
+import cz.senslog.connector.app.config.api.FileBuilder;
+import cz.senslog.connector.app.config.api.FileConfigurationService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

connector-common/src/main/java/cz/senslog/connector/config/FileConfigurationServiceImpl.java → connector-app/src/main/java/cz/senslog/connector/app/config/FileConfigurationServiceImpl.java

@@ -1,6 +1,6 @@
-package cz.senslog.connector.config;
+package cz.senslog.connector.app.config;
 
-import cz.senslog.connector.config.api.FileConfigurationService;
+import cz.senslog.connector.app.config.api.FileConfigurationService;
 import cz.senslog.connector.config.model.ConnectorDescriptor;
 import cz.senslog.connector.config.model.DefaultConfig;
 import cz.senslog.connector.exception.UnsupportedFileException;

connector-common/src/main/java/cz/senslog/connector/config/api/ConfigurationService.java → connector-app/src/main/java/cz/senslog/connector/app/config/api/ConfigurationService.java

@@ -1,7 +1,7 @@
-package cz.senslog.connector.config.api;
+package cz.senslog.connector.app.config.api;
 
-import cz.senslog.connector.config.DatabaseBuilderImpl;
-import cz.senslog.connector.config.FileBuilderImpl;
+import cz.senslog.connector.app.config.DatabaseBuilderImpl;
+import cz.senslog.connector.app.config.FileBuilderImpl;
 import cz.senslog.connector.config.model.ConnectorDescriptor;
 import cz.senslog.connector.config.model.DefaultConfig;
 

connector-common/src/main/java/cz/senslog/connector/config/api/DatabaseBuilder.java → connector-app/src/main/java/cz/senslog/connector/app/config/api/DatabaseBuilder.java

@@ -1,4 +1,4 @@
-package cz.senslog.connector.config.api;
+package cz.senslog.connector.app.config.api;
 
 
 /**

connector-common/src/main/java/cz/senslog/connector/config/api/DatabaseConfigurationService.java → connector-app/src/main/java/cz/senslog/connector/app/config/api/DatabaseConfigurationService.java

@@ -1,4 +1,4 @@
-package cz.senslog.connector.config.api;
+package cz.senslog.connector.app.config.api;
 
 import java.io.IOException;
 

connector-common/src/main/java/cz/senslog/connector/config/api/FileBuilder.java → connector-app/src/main/java/cz/senslog/connector/app/config/api/FileBuilder.java

@@ -1,4 +1,4 @@
-package cz.senslog.connector.config.api;
+package cz.senslog.connector.app.config.api;
 
 /**
  * The interface {@code FileBuilder} provides a configuration

connector-common/src/main/java/cz/senslog/connector/config/api/FileConfigurationService.java → connector-app/src/main/java/cz/senslog/connector/app/config/api/FileConfigurationService.java

@@ -1,4 +1,4 @@
-package cz.senslog.connector.config.api;
+package cz.senslog.connector.app.config.api;
 
 import java.io.IOException;
 

connector-app/src/test/java/ConnectorBuilderTest.java → connector-app/src/test/java/cz/senslog/connector/app/config/ConnectorBuilderTest.java

@@ -1,9 +1,8 @@
-import cz.senslog.connector.app.config.Connector;
-import cz.senslog.connector.app.config.ConnectorBuilder;
-import cz.senslog.connector.app.config.ServiceProvider;
-import cz.senslog.connector.config.api.ConfigurationService;
-import cz.senslog.connector.config.model.DefaultConfig;
+package cz.senslog.connector.app.config;
+
+import cz.senslog.connector.app.config.api.ConfigurationService;
 import cz.senslog.connector.config.model.ConnectorDescriptor;
+import cz.senslog.connector.config.model.DefaultConfig;
 import cz.senslog.connector.fetch.api.ConnectorFetchProvider;
 import cz.senslog.connector.fetch.api.ConnectorFetcher;
 import cz.senslog.connector.model.api.AbstractModel;

connector-common/src/test/java/cz/senslog/connector/config/FileBuilderImplTest.java → connector-app/src/test/java/cz/senslog/connector/app/config/FileBuilderImplTest.java

@@ -1,6 +1,6 @@
-package cz.senslog.connector.config;
+package cz.senslog.connector.app.config;
 
-import cz.senslog.connector.config.api.ConfigurationService;
+import cz.senslog.connector.app.config.api.ConfigurationService;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;

connector-common/src/test/java/cz/senslog/connector/config/FileConfigurationServiceImplTest.java → connector-app/src/test/java/cz/senslog/connector/app/config/FileConfigurationServiceImplTest.java

@@ -1,8 +1,8 @@
-package cz.senslog.connector.config;
+package cz.senslog.connector.app.config;
 
-import cz.senslog.connector.config.model.DefaultConfig;
-import cz.senslog.connector.config.api.FileConfigurationService;
+import cz.senslog.connector.app.config.api.FileConfigurationService;
 import cz.senslog.connector.config.model.ConnectorDescriptor;
+import cz.senslog.connector.config.model.DefaultConfig;
 import cz.senslog.connector.exception.UnsupportedFileException;
 import org.junit.jupiter.api.Test;
 

connector-common/src/test/java/cz/senslog/connector/config/TestFetchProviderClass.java → connector-app/src/test/java/cz/senslog/connector/app/config/TestFetchProviderClass.java

@@ -1,4 +1,4 @@
-package cz.senslog.connector.config;
+package cz.senslog.connector.app.config;
 
 public class TestFetchProviderClass {
 }

connector-app/src/test/java/cz/senslog/connector/app/config/TestPushProviderClass.java

@@ -0,0 +1,4 @@
+package cz.senslog.connector.app.config;
+
+public class TestPushProviderClass {
+}

connector-common/src/test/resources/test_valid_config.yaml → connector-app/src/test/resources/test_valid_config.yaml

@@ -1,11 +1,11 @@
 settings:
   - FetchProviderId:
       name: "<name>"
-      provider: "cz.senslog.connector.config.TestFetchProviderClass"
+      provider: "cz.senslog.connector.app.config.TestFetchProviderClass"
 
   - PushProviderId:
       name: "<name>"
-      provider: "cz.senslog.connector.config.TestPushProviderClass"
+      provider: "cz.senslog.connector.app.config.TestPushProviderClass"
 
 connectors:
   - ConnectorName:

connector-common/src/test/java/cz/senslog/connector/config/TestPushProviderClass.java

@@ -1,4 +0,0 @@
-package cz.senslog.connector.config;
-
-public class TestPushProviderClass {
-}