refactoring

eclipse-store · Nov 7, 2023 · 5df17b9 · 5df17b9
1 parent 441e7bb
commit 5df17b9
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 12 deletions.
diff --git a/integrations/spring-boot3/src/main/java/module-info.java b/integrations/spring-boot3/src/main/java/module-info.java
@@ -25,8 +25,9 @@
 	exports org.eclipse.store.integrations.spring.boot.types.configuration.redis;
 	exports org.eclipse.store.integrations.spring.boot.types.configuration.sql;
 	exports org.eclipse.store.integrations.spring.boot.types;
+    exports org.eclipse.store.integrations.spring.boot.types.converter;
 
-	requires transitive spring.beans;
+    requires transitive spring.beans;
 	requires transitive spring.boot;
 	requires transitive spring.boot.autoconfigure;
 	requires transitive spring.context;

diff --git a/.../main/java/org/eclipse/store/integrations/spring/boot/types/EclipseStoreProviderImpl.java b/.../main/java/org/eclipse/store/integrations/spring/boot/types/EclipseStoreProviderImpl.java
@@ -16,6 +16,7 @@
 
 import org.eclipse.serializer.util.logging.Logging;
 import org.eclipse.store.integrations.spring.boot.types.configuration.ConfigurationValues;
+import org.eclipse.store.integrations.spring.boot.types.converter.EclipseStoreConfigConverter;
 import org.eclipse.store.storage.embedded.configuration.types.EmbeddedStorageConfigurationBuilder;
 import org.eclipse.store.storage.embedded.types.EmbeddedStorageFoundation;
 import org.eclipse.store.storage.embedded.types.EmbeddedStorageManager;

diff --git a/...boot/types/EclipseStoreConfiguration.java → ...ng/boot/types/EclipseStoreSpringBoot.java b/...boot/types/EclipseStoreConfiguration.java → ...ng/boot/types/EclipseStoreSpringBoot.java
@@ -23,6 +23,6 @@
 @AutoConfiguration
 @ComponentScan(basePackages = "org.eclipse.store.integrations.spring.boot.types")
 @EnableConfigurationProperties(ConfigurationValues.class)
-public class EclipseStoreConfiguration
+public class EclipseStoreSpringBoot
 {
 }
diff --git a/...rations/spring/boot/types/ConfigKeys.java → ...ring/boot/types/converter/ConfigKeys.java b/...rations/spring/boot/types/ConfigKeys.java → ...ring/boot/types/converter/ConfigKeys.java
@@ -1,4 +1,4 @@
-package org.eclipse.store.integrations.spring.boot.types;
+package org.eclipse.store.integrations.spring.boot.types.converter;
 
 /*-
  * #%L

diff --git a/...ot/types/EclipseStoreConfigConverter.java → ...onverter/EclipseStoreConfigConverter.java b/...ot/types/EclipseStoreConfigConverter.java → ...onverter/EclipseStoreConfigConverter.java
@@ -1,4 +1,4 @@
-package org.eclipse.store.integrations.spring.boot.types;
+package org.eclipse.store.integrations.spring.boot.types.converter;
 
 /*-
  * #%L

diff --git a/...java/org/eclipse/store/integrations/spring/boot/types/EclipseConfigurationSpringTest.java b/...java/org/eclipse/store/integrations/spring/boot/types/EclipseConfigurationSpringTest.java
@@ -14,7 +14,9 @@
  * #L%
  */
 
+import org.eclipse.store.integrations.spring.boot.types.EclipseStoreSpringBoot;
 import org.eclipse.store.integrations.spring.boot.types.configuration.ConfigurationValues;
+import org.eclipse.store.integrations.spring.boot.types.converter.EclipseStoreConfigConverter;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -26,7 +28,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @TestPropertySource("classpath:application-test.properties")
-@SpringBootTest(classes = {EclipseStoreConfiguration.class})
+@SpringBootTest(classes = {EclipseStoreSpringBoot.class})
 public class EclipseConfigurationSpringTest
 {
 

diff --git a/...a/org/eclipse/store/integrations/spring/boot/types/EclipseConfigurationSqlSpringTest.java b/...a/org/eclipse/store/integrations/spring/boot/types/EclipseConfigurationSqlSpringTest.java
@@ -15,6 +15,7 @@
  */
 
 import org.eclipse.store.integrations.spring.boot.types.configuration.ConfigurationValues;
+import org.eclipse.store.integrations.spring.boot.types.converter.EclipseStoreConfigConverter;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -26,7 +27,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @TestPropertySource("classpath:application-sql.properties")
-@SpringBootTest(classes = {EclipseStoreConfiguration.class})
+@SpringBootTest(classes = {EclipseStoreSpringBoot.class})
 public class EclipseConfigurationSqlSpringTest
 {
 

diff --git a/...boot3/src/test/java/org/eclipse/store/integrations/spring/boot/types/StorageBeanTest.java b/...boot3/src/test/java/org/eclipse/store/integrations/spring/boot/types/StorageBeanTest.java
@@ -28,7 +28,7 @@
 import org.springframework.test.context.TestPropertySource;
 
 @TestPropertySource("classpath:application-run.properties")
-@SpringBootTest(classes = {EclipseStoreConfiguration.class, StorageBeanTest.class})
+@SpringBootTest(classes = {EclipseStoreSpringBoot.class, StorageBeanTest.class})
 public class StorageBeanTest
 {
 

diff --git a/...s/spring/boot/types/ConfigFieldsTest.java → ...oot/types/converter/ConfigFieldsTest.java b/...s/spring/boot/types/ConfigFieldsTest.java → ...oot/types/converter/ConfigFieldsTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.store.integrations.spring.boot.types;
+package org.eclipse.store.integrations.spring.boot.types.converter;
 
 /*-
  * #%L
@@ -19,8 +19,8 @@
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
+import org.eclipse.store.integrations.spring.boot.types.converter.EclipseStoreConfigConverter;
 import org.eclipse.store.storage.embedded.configuration.types.EmbeddedStorageConfigurationPropertyNames;
 import org.junit.jupiter.api.Test;
 

diff --git a/...ypes/EclipseStoreConfigConverterTest.java → ...rter/EclipseStoreConfigConverterTest.java b/...ypes/EclipseStoreConfigConverterTest.java → ...rter/EclipseStoreConfigConverterTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.store.integrations.spring.boot.types;
+package org.eclipse.store.integrations.spring.boot.types.converter;
 
 /*-
  * #%L
@@ -20,6 +20,7 @@
 import org.eclipse.store.integrations.spring.boot.types.configuration.StorageFilesystem;
 import org.eclipse.store.integrations.spring.boot.types.configuration.sql.Mariadb;
 import org.eclipse.store.integrations.spring.boot.types.configuration.sql.Sql;
+import org.eclipse.store.integrations.spring.boot.types.converter.EclipseStoreConfigConverter;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;

diff --git a/...rc/test/java/org/eclipse/store/integrations/spring/boot/types/root/AutostartRootTest.java b/...rc/test/java/org/eclipse/store/integrations/spring/boot/types/root/AutostartRootTest.java
@@ -1,6 +1,6 @@
 package org.eclipse.store.integrations.spring.boot.types.root;
 
-import org.eclipse.store.integrations.spring.boot.types.EclipseStoreConfiguration;
+import org.eclipse.store.integrations.spring.boot.types.EclipseStoreSpringBoot;
 import org.eclipse.store.storage.embedded.types.EmbeddedStorageManager;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @TestPropertySource("classpath:application-autostart-root.properties")
-@SpringBootTest(classes = {EclipseStoreConfiguration.class})
+@SpringBootTest(classes = {EclipseStoreSpringBoot.class})
 public class AutostartRootTest
 {