Adapt to serializer refactorings (#49)

* Adapt to serializer refactorings * Fix dependencies and imports * Update maven_converter.yml --------- Co-authored-by: Zdenek Jonas <[email protected]>
eclipse-store · Oct 5, 2023 · a85e575 · a85e575
1 parent aff79ff
commit a85e575
Show file tree

Hide file tree

Showing 45 changed files with 109 additions and 105 deletions.
diff --git a/afs/aws/aws/pom.xml b/afs/aws/aws/pom.xml
@@ -26,9 +26,9 @@
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.store</groupId>
+			<groupId>org.eclipse.serializer</groupId>
 			<artifactId>configuration</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>${eclipse.serializer.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>software.amazon.awssdk</groupId>

diff --git a/afs/aws/aws/src/main/java/module-info.java b/afs/aws/aws/src/main/java/module-info.java
@@ -16,7 +16,7 @@
 	exports org.eclipse.store.afs.aws.types;
 
 	requires transitive org.eclipse.serializer.afs;
-	requires transitive org.eclipse.store.configuration;
+	requires transitive org.eclipse.serializer.configuration;
 	requires transitive software.amazon.awssdk.auth;
 	requires transitive software.amazon.awssdk.awscore;
 	requires transitive software.amazon.awssdk.core;

diff --git a/afs/aws/aws/src/main/java/org/eclipse/store/afs/aws/types/AwsFileSystemCreator.java b/afs/aws/aws/src/main/java/org/eclipse/store/afs/aws/types/AwsFileSystemCreator.java
@@ -17,10 +17,11 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import org.eclipse.store.configuration.exceptions.ConfigurationException;
-import org.eclipse.store.configuration.types.Configuration;
-import org.eclipse.store.configuration.types.ConfigurationBasedCreator;
 import org.eclipse.serializer.afs.types.AFileSystem;
+import org.eclipse.serializer.configuration.exceptions.ConfigurationException;
+import org.eclipse.serializer.configuration.types.Configuration;
+import org.eclipse.serializer.configuration.types.ConfigurationBasedCreator;
+
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;

diff --git a/afs/aws/dynamodb/src/main/java/module-info.java b/afs/aws/dynamodb/src/main/java/module-info.java
@@ -15,7 +15,7 @@
 {
 	exports org.eclipse.store.afs.aws.dynamodb.types;
 
-	provides org.eclipse.store.configuration.types.ConfigurationBasedCreator
+	provides org.eclipse.serializer.configuration.types.ConfigurationBasedCreator
 	    with org.eclipse.store.afs.aws.dynamodb.types.DynamoDbFileSystemCreator
 	;
 

diff --git a/...odb/src/main/java/org/eclipse/store/afs/aws/dynamodb/types/DynamoDbFileSystemCreator.java b/...odb/src/main/java/org/eclipse/store/afs/aws/dynamodb/types/DynamoDbFileSystemCreator.java
@@ -14,10 +14,11 @@
  * #L%
  */
 
+import org.eclipse.serializer.afs.types.AFileSystem;
+import org.eclipse.serializer.configuration.types.Configuration;
 import org.eclipse.store.afs.aws.types.AwsFileSystemCreator;
 import org.eclipse.store.afs.blobstore.types.BlobStoreFileSystem;
-import org.eclipse.store.configuration.types.Configuration;
-import org.eclipse.serializer.afs.types.AFileSystem;
+
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClientBuilder;
 

diff --git a/afs/aws/s3/src/main/java/module-info.java b/afs/aws/s3/src/main/java/module-info.java
@@ -15,7 +15,7 @@
 {
 	exports org.eclipse.store.afs.aws.s3.types;
 
-	provides org.eclipse.store.configuration.types.ConfigurationBasedCreator
+	provides org.eclipse.serializer.configuration.types.ConfigurationBasedCreator
 	    with org.eclipse.store.afs.aws.s3.types.S3FileSystemCreator
 	;
 

diff --git a/afs/aws/s3/src/main/java/org/eclipse/store/afs/aws/s3/types/S3FileSystemCreator.java b/afs/aws/s3/src/main/java/org/eclipse/store/afs/aws/s3/types/S3FileSystemCreator.java
@@ -1,5 +1,8 @@
 package org.eclipse.store.afs.aws.s3.types;
 
+import org.eclipse.serializer.afs.types.AFileSystem;
+import org.eclipse.serializer.configuration.types.Configuration;
+
 /*-
  * #%L
  * EclipseStore Abstract File System AWS S3
@@ -16,8 +19,7 @@
 
 import org.eclipse.store.afs.aws.types.AwsFileSystemCreator;
 import org.eclipse.store.afs.blobstore.types.BlobStoreFileSystem;
-import org.eclipse.store.configuration.types.Configuration;
-import org.eclipse.serializer.afs.types.AFileSystem;
+
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.S3ClientBuilder;
 

diff --git a/afs/azure/storage/pom.xml b/afs/azure/storage/pom.xml
@@ -24,9 +24,9 @@
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.store</groupId>
+			<groupId>org.eclipse.serializer</groupId>
 			<artifactId>configuration</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>${eclipse.serializer.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.azure</groupId>

diff --git a/afs/azure/storage/src/main/java/module-info.java b/afs/azure/storage/src/main/java/module-info.java
@@ -15,11 +15,11 @@
 {
 	exports org.eclipse.store.afs.azure.storage.types;
 
-	provides org.eclipse.store.configuration.types.ConfigurationBasedCreator
+	provides org.eclipse.serializer.configuration.types.ConfigurationBasedCreator
 	    with org.eclipse.store.afs.azure.storage.types.AzureStorageFileSystemCreator
 	;
 
-	requires transitive org.eclipse.store.configuration;
+	requires transitive org.eclipse.serializer.configuration;
 	requires transitive org.eclipse.store.afs.blobstore;
 	requires transitive com.azure.core;
 	requires transitive com.azure.storage.blob;

diff --git a/...rc/main/java/org/eclipse/store/afs/azure/storage/types/AzureStorageFileSystemCreator.java b/...rc/main/java/org/eclipse/store/afs/azure/storage/types/AzureStorageFileSystemCreator.java
@@ -14,16 +14,16 @@
  * #L%
  */
 
+import org.eclipse.serializer.afs.types.AFileSystem;
+import org.eclipse.serializer.configuration.types.Configuration;
+import org.eclipse.serializer.configuration.types.ConfigurationBasedCreator;
+import org.eclipse.store.afs.blobstore.types.BlobStoreFileSystem;
+
 import com.azure.core.credential.BasicAuthenticationCredential;
 import com.azure.storage.blob.BlobServiceClient;
 import com.azure.storage.blob.BlobServiceClientBuilder;
 import com.azure.storage.common.StorageSharedKeyCredential;
 
-import org.eclipse.store.afs.blobstore.types.BlobStoreFileSystem;
-import org.eclipse.store.configuration.types.Configuration;
-import org.eclipse.store.configuration.types.ConfigurationBasedCreator;
-import org.eclipse.serializer.afs.types.AFileSystem;
-
 
 public class AzureStorageFileSystemCreator extends ConfigurationBasedCreator.Abstract<AFileSystem>
 {

diff --git a/afs/blobstore/pom.xml b/afs/blobstore/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>org.eclipse.serializer</groupId>
 			<artifactId>afs</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>${eclipse.serializer.version}</version>
 		</dependency>
 	</dependencies>
 

diff --git a/afs/googlecloud/firestore/src/main/java/module-info.java b/afs/googlecloud/firestore/src/main/java/module-info.java
@@ -15,11 +15,11 @@
 {
 	exports org.eclipse.store.afs.googlecloud.firestore.types;
 
-	provides org.eclipse.store.configuration.types.ConfigurationBasedCreator
+	provides org.eclipse.serializer.configuration.types.ConfigurationBasedCreator
 	    with org.eclipse.store.afs.googlecloud.firestore.types.GoogleCloudFirestoreFileSystemCreator
 	;
 
-	requires transitive org.eclipse.store.configuration;
+	requires transitive org.eclipse.serializer.configuration;
 	requires transitive org.eclipse.store.afs.blobstore;
 	requires transitive com.google.api.apicommon;
 	requires transitive com.google.auth;

diff --git a/.../eclipse/store/afs/googlecloud/firestore/types/GoogleCloudFirestoreFileSystemCreator.java b/.../eclipse/store/afs/googlecloud/firestore/types/GoogleCloudFirestoreFileSystemCreator.java
@@ -20,18 +20,18 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import org.eclipse.serializer.afs.types.AFileSystem;
+import org.eclipse.serializer.chars.XChars;
+import org.eclipse.serializer.configuration.exceptions.ConfigurationException;
+import org.eclipse.serializer.configuration.types.Configuration;
+import org.eclipse.serializer.configuration.types.ConfigurationBasedCreator;
+import org.eclipse.store.afs.blobstore.types.BlobStoreFileSystem;
+
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.firestore.Firestore;
 import com.google.cloud.firestore.FirestoreOptions;
 
-import org.eclipse.store.afs.blobstore.types.BlobStoreFileSystem;
-import org.eclipse.store.configuration.exceptions.ConfigurationException;
-import org.eclipse.store.configuration.types.Configuration;
-import org.eclipse.store.configuration.types.ConfigurationBasedCreator;
-import org.eclipse.serializer.afs.types.AFileSystem;
-import org.eclipse.serializer.chars.XChars;
-
 public class GoogleCloudFirestoreFileSystemCreator extends ConfigurationBasedCreator.Abstract<AFileSystem>
 {
 	private final static String CLASSPATH_PREFIX = "classpath:";

diff --git a/afs/googlecloud/pom.xml b/afs/googlecloud/pom.xml
@@ -43,9 +43,9 @@
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.store</groupId>
+			<groupId>org.eclipse.serializer</groupId>
 			<artifactId>configuration</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>${eclipse.serializer.version}</version>
 		</dependency>
 	</dependencies>
 

diff --git a/afs/hazelcast/pom.xml b/afs/hazelcast/pom.xml
@@ -26,9 +26,9 @@
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.store</groupId>
+			<groupId>org.eclipse.serializer</groupId>
 			<artifactId>configuration</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>${eclipse.serializer.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.hazelcast</groupId>

diff --git a/afs/hazelcast/src/main/java/module-info.java b/afs/hazelcast/src/main/java/module-info.java
@@ -15,11 +15,11 @@
 {
 	exports org.eclipse.store.afs.hazelcast.types;
 
-	provides org.eclipse.store.configuration.types.ConfigurationBasedCreator
+	provides org.eclipse.serializer.configuration.types.ConfigurationBasedCreator
 	    with org.eclipse.store.afs.hazelcast.types.HazelcastFileSystemCreator
 	;
 
-	requires transitive org.eclipse.store.configuration;
+	requires transitive org.eclipse.serializer.configuration;
 	requires transitive org.eclipse.store.afs.blobstore;
 	requires transitive com.hazelcast.core;
 }
diff --git a/...lcast/src/main/java/org/eclipse/store/afs/hazelcast/types/HazelcastFileSystemCreator.java b/...lcast/src/main/java/org/eclipse/store/afs/hazelcast/types/HazelcastFileSystemCreator.java
@@ -19,6 +19,13 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import org.eclipse.serializer.afs.types.AFileSystem;
+import org.eclipse.serializer.chars.XChars;
+import org.eclipse.serializer.configuration.exceptions.ConfigurationException;
+import org.eclipse.serializer.configuration.types.Configuration;
+import org.eclipse.serializer.configuration.types.ConfigurationBasedCreator;
+import org.eclipse.store.afs.blobstore.types.BlobStoreFileSystem;
+
 import com.hazelcast.config.ClasspathXmlConfig;
 import com.hazelcast.config.ClasspathYamlConfig;
 import com.hazelcast.config.Config;
@@ -29,13 +36,6 @@
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 
-import org.eclipse.store.afs.blobstore.types.BlobStoreFileSystem;
-import org.eclipse.store.configuration.exceptions.ConfigurationException;
-import org.eclipse.store.configuration.types.Configuration;
-import org.eclipse.store.configuration.types.ConfigurationBasedCreator;
-import org.eclipse.serializer.afs.types.AFileSystem;
-import org.eclipse.serializer.chars.XChars;
-
 
 public class HazelcastFileSystemCreator extends ConfigurationBasedCreator.Abstract<AFileSystem>
 {

diff --git a/afs/kafka/pom.xml b/afs/kafka/pom.xml
@@ -24,9 +24,9 @@
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.store</groupId>
+			<groupId>org.eclipse.serializer</groupId>
 			<artifactId>configuration</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>${eclipse.serializer.version}</version>
 		</dependency>
 		<dependency>
             <groupId>org.apache.kafka</groupId>

diff --git a/afs/kafka/src/main/java/module-info.java b/afs/kafka/src/main/java/module-info.java
@@ -15,11 +15,11 @@
 {
 	exports org.eclipse.store.afs.kafka.types;
 
-	provides org.eclipse.store.configuration.types.ConfigurationBasedCreator
+	provides org.eclipse.serializer.configuration.types.ConfigurationBasedCreator
 	    with org.eclipse.store.afs.kafka.types.KafkaFileSystemCreator
 	;
 
-	requires transitive org.eclipse.store.configuration;
+	requires transitive org.eclipse.serializer.configuration;
 	requires transitive org.eclipse.store.afs.blobstore;
 	requires transitive kafka.clients;
 }
diff --git a/afs/kafka/src/main/java/org/eclipse/store/afs/kafka/types/KafkaFileSystemCreator.java b/afs/kafka/src/main/java/org/eclipse/store/afs/kafka/types/KafkaFileSystemCreator.java
@@ -16,10 +16,10 @@
 
 import java.util.Properties;
 
-import org.eclipse.store.afs.blobstore.types.BlobStoreFileSystem;
-import org.eclipse.store.configuration.types.Configuration;
-import org.eclipse.store.configuration.types.ConfigurationBasedCreator;
 import org.eclipse.serializer.afs.types.AFileSystem;
+import org.eclipse.serializer.configuration.types.Configuration;
+import org.eclipse.serializer.configuration.types.ConfigurationBasedCreator;
+import org.eclipse.store.afs.blobstore.types.BlobStoreFileSystem;
 
 
 public class KafkaFileSystemCreator extends ConfigurationBasedCreator.Abstract<AFileSystem>

diff --git a/afs/nio/pom.xml b/afs/nio/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>org.eclipse.serializer</groupId>
 			<artifactId>afs</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>${eclipse.serializer.version}</version>
 		</dependency>
 	</dependencies>
 

diff --git a/afs/oracle/coherence/pom.xml b/afs/oracle/coherence/pom.xml
@@ -38,9 +38,9 @@
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.store</groupId>
+			<groupId>org.eclipse.serializer</groupId>
 			<artifactId>configuration</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>${eclipse.serializer.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.oracle.coherence.ce</groupId>

diff --git a/afs/oracle/coherence/src/main/java/module-info.java b/afs/oracle/coherence/src/main/java/module-info.java
@@ -15,11 +15,11 @@
 {
 	exports org.eclipse.store.afs.oracle.coherence.types;
 
-	provides org.eclipse.store.configuration.types.ConfigurationBasedCreator
+	provides org.eclipse.serializer.configuration.types.ConfigurationBasedCreator
 	    with org.eclipse.store.afs.oracle.coherence.types.OracleCoherenceFileSystemCreator
 	;
 
-	requires transitive org.eclipse.store.configuration;
+	requires transitive org.eclipse.serializer.configuration;
 	requires transitive org.eclipse.store.afs.blobstore;
 	requires transitive com.oracle.coherence.ce;
 }
diff --git a/...n/java/org/eclipse/store/afs/oracle/coherence/types/OracleCoherenceFileSystemCreator.java b/...n/java/org/eclipse/store/afs/oracle/coherence/types/OracleCoherenceFileSystemCreator.java
@@ -16,15 +16,15 @@
 
 import java.util.Map;
 
-import com.tangosol.net.CacheFactory;
-import com.tangosol.net.NamedCache;
-
-import org.eclipse.store.afs.blobstore.types.BlobStoreFileSystem;
-import org.eclipse.store.configuration.exceptions.ConfigurationException;
-import org.eclipse.store.configuration.types.Configuration;
-import org.eclipse.store.configuration.types.ConfigurationBasedCreator;
 import org.eclipse.serializer.afs.types.AFileSystem;
 import org.eclipse.serializer.chars.XChars;
+import org.eclipse.serializer.configuration.exceptions.ConfigurationException;
+import org.eclipse.serializer.configuration.types.Configuration;
+import org.eclipse.serializer.configuration.types.ConfigurationBasedCreator;
+import org.eclipse.store.afs.blobstore.types.BlobStoreFileSystem;
+
+import com.tangosol.net.CacheFactory;
+import com.tangosol.net.NamedCache;
 
 
 public class OracleCoherenceFileSystemCreator extends ConfigurationBasedCreator.Abstract<AFileSystem>

diff --git a/afs/oraclecloud/objectstorage/pom.xml b/afs/oraclecloud/objectstorage/pom.xml
@@ -26,9 +26,9 @@
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.store</groupId>
+			<groupId>org.eclipse.serializer</groupId>
 			<artifactId>configuration</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>${eclipse.serializer.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.oracle.oci.sdk</groupId>

diff --git a/afs/oraclecloud/objectstorage/src/main/java/module-info.java b/afs/oraclecloud/objectstorage/src/main/java/module-info.java
@@ -15,11 +15,11 @@
 {
 	exports org.eclipse.store.afs.oraclecloud.objectstorage.types;
 
-	provides org.eclipse.store.configuration.types.ConfigurationBasedCreator
+	provides org.eclipse.serializer.configuration.types.ConfigurationBasedCreator
 	    with org.eclipse.store.afs.oraclecloud.objectstorage.types.OracleCloudObjectStorageFileSystemCreator
 	;
 
-	requires transitive org.eclipse.store.configuration;
+	requires transitive org.eclipse.serializer.configuration;
 	requires transitive org.eclipse.store.afs.blobstore;
 	requires transitive oci.java.sdk.common;
 	requires transitive oci.java.sdk.objectstorage.extensions;