[DE-445] JPMS compatibility (#477)

* removed unneeded methods from ConfigPropertiesProvider

* [DE-445] fixed FileConfigPropertiesProvider with JPMS

* [DE-445] JPMS module names

Author: rashtao

driver/pom.xml

@@ -18,6 +18,7 @@
         <maven.deploy.skip>false</maven.deploy.skip>
         <SslTest>false</SslTest>
         <sonar.test.exclusions>src/test/**/*</sonar.test.exclusions>
+        <moduleName>com.arangodb.driver</moduleName>
     </properties>
 
     <profiles>

driver/src/main/java/com/arangodb/config/ConfigPropertiesProvider.java

@@ -9,17 +9,4 @@ public interface ConfigPropertiesProvider {
      */
     String getProperty(String key);
 
-    default String getProperty(ConfigPropertyKey key) {
-        return getProperty(key.getValue());
-    }
-
-    default String getProperty(String key, String defaultValue) {
-        String p = getProperty(key);
-        return p != null ? p : defaultValue;
-    }
-
-    default String getProperty(ConfigPropertyKey key, String defaultValue) {
-        String p = getProperty(key);
-        return p != null ? p : defaultValue;
-    }
 }

driver/src/main/java/com/arangodb/internal/InternalArangoDBBuilder.java

@@ -60,7 +60,7 @@ public abstract class InternalArangoDBBuilder {
     protected Integer responseQueueTimeSamples = ArangoDefaults.DEFAULT_RESPONSE_QUEUE_TIME_SAMPLES;
 
     private static void loadHosts(final ConfigPropertiesProvider properties, final Collection<HostDescription> hosts) {
-        final String hostsProp = properties.getProperty(ConfigPropertyKey.HOSTS);
+        final String hostsProp = properties.getProperty(ConfigPropertyKey.HOSTS.getValue());
         if (hostsProp != null) {
             final String[] hostsSplit = hostsProp.split(",");
             for (final String host : hostsSplit) {
@@ -138,8 +138,10 @@ private static LoadBalancingStrategy loadLoadBalancingStrategy(
     }
 
     protected static String getProperty(ConfigPropertiesProvider props, ConfigPropertyKey key, Object currentValue) {
-        String defaultValue = currentValue == null ? null : currentValue.toString();
-        return props.getProperty(key, defaultValue);
+        String p = props.getProperty(key.getValue());
+        if (p != null) return p;
+        if (currentValue != null) return currentValue.toString();
+        return null;
     }
 
     protected static ArangoSerdeProvider serdeProvider() {

driver/src/main/java/com/arangodb/internal/config/FileConfigPropertiesProvider.java

@@ -12,7 +12,7 @@
  */
 public class FileConfigPropertiesProvider implements ConfigPropertiesProvider {
     private static final String DEFAULT_PREFIX = "arangodb";
-    private static final String DEFAULT_PROPERTY_FILE = "/arangodb.properties";
+    private static final String DEFAULT_PROPERTY_FILE = "arangodb.properties";
     private final Properties properties;
     private final String prefix;
 
@@ -35,7 +35,7 @@ private String initPrefix(String p) {
 
     private Properties initProperties(String fileName) {
         Properties p = new Properties();
-        try (InputStream is = FileConfigPropertiesProvider.class.getResourceAsStream(fileName)) {
+        try (InputStream is = getClass().getClassLoader().getResourceAsStream(fileName)) {
             p.load(is);
         } catch (Exception e) {
             throw new ArangoDBException("Got exception while reading properties file " + fileName, e);

jackson-serde/pom.xml

@@ -15,6 +15,7 @@
 
     <properties>
         <maven.deploy.skip>false</maven.deploy.skip>
+        <moduleName>com.arangodb.serde.jackson</moduleName>
     </properties>
 
     <dependencies>

jsonb-serde/pom.xml

@@ -16,6 +16,7 @@
     <properties>
         <!-- FIXME: requires JDK 11 -->
         <maven.deploy.skip>true</maven.deploy.skip>
+        <moduleName>com.arangodb.serde.jsonb</moduleName>
     </properties>
 
     <dependencies>

pom.xml

@@ -263,6 +263,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>${moduleName}</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>

resilience-tests/pom.xml

@@ -11,11 +11,6 @@
 
     <artifactId>resilience-tests</artifactId>
 
-    <properties>
-        <maven.compiler.target>17</maven.compiler.target>
-        <maven.compiler.source>17</maven.compiler.source>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.mock-server</groupId>

resilience-tests/src/test/java/resilience/ActiveFailoverTest.java

@@ -12,6 +12,7 @@
 import org.junit.jupiter.api.Tag;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 
 @Tag("activeFailover")
@@ -20,7 +21,7 @@ public abstract class ActiveFailoverTest {
     protected static final String HOST = "127.0.0.1";
     protected static final String PASSWORD = "test";
     protected static final MemoryAppender logs = new MemoryAppender(Level.WARN);
-    private static final List<Endpoint> endpoints = List.of(
+    private static final List<Endpoint> endpoints = Arrays.asList(
             new Endpoint("activeFailover1", HOST, 18529, "172.28.0.1:8529"),
             new Endpoint("activeFailover2", HOST, 18539, "172.28.0.1:8539"),
             new Endpoint("activeFailover3", HOST, 18549, "172.28.0.1:8549")

resilience-tests/src/test/java/resilience/ClusterTest.java

@@ -12,6 +12,7 @@
 import org.junit.jupiter.api.Tag;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 
 @Tag("cluster")
@@ -20,7 +21,7 @@ public abstract class ClusterTest {
     protected static final String HOST = "127.0.0.1";
     protected static final String PASSWORD = "test";
     protected static final MemoryAppender logs = new MemoryAppender(Level.WARN);
-    private static final List<Endpoint> endpoints = List.of(
+    private static final List<Endpoint> endpoints = Arrays.asList(
             new Endpoint("cluster1", HOST, 18529, "172.28.0.1:8529"),
             new Endpoint("cluster2", HOST, 18539, "172.28.0.1:8539"),
             new Endpoint("cluster3", HOST, 18549, "172.28.0.1:8549")