GitResolver + Remove checked exceptions in ResourceResolver (#38)

* GitResolver + Remove checked exceptions in ResourceResolver

* Move app.properties to test resources

* GitResolver updates and tests

* Fix typo

* Revamp GitResolver APIs

* Javadoc updates

* Cleanup + Fix multi JVM tests

* Fix Gradle test tasks ordering

* Fix getOrDefault in multi-jvm-tests.gradle

* Move InvocationHandlerFactory to internal

Author: joel-jeremy

.github/workflows/gradle-build.yaml

@@ -3,18 +3,13 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        # LTS versions + the latest java version
-        java: [ 8, 11, 17, 18 ] 
-
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 11
           distribution: 'temurin'
 
       - name: Validate Gradle wrapper
@@ -24,4 +19,6 @@ jobs:
         uses: gradle/gradle-build-action@v2
 
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew build
+        env:
+          ADDITIONAL_TEST_RUNS_ON_JVM_VERSIONS: 17,18

build.gradle

@@ -13,9 +13,10 @@ apply from: "${rootDir}/gradle/reporting.gradle"
 apply from: "${rootDir}/gradle/coveralls.gradle"
 apply from: "${rootDir}/gradle/snyk.gradle"
 apply from: "${rootDir}/gradle/sonarqube.gradle"
+apply from: "${rootDir}/gradle/dependency-updates.gradle"
 
 allprojects {
-    apply from: "${rootDir}/gradle/dependencies.gradle"
+    apply from: "${rootDir}/gradle/dependency-versions.gradle"
 
     group = "io.github.joeljeremy7.externalizedproperties"
 
@@ -36,6 +37,7 @@ configure(javaProjects) {
 
     apply from: "${rootDir}/gradle/publications.gradle"
     apply from: "${rootDir}/gradle/code-quality.gradle"
+    apply from: "${rootDir}/gradle/multi-jvm-tests.gradle"
 
     dependencies {
         testImplementation "org.junit.jupiter:junit-jupiter:${versions.junitJupiter}"
@@ -44,7 +46,7 @@ configure(javaProjects) {
     testing {
         suites { 
             test { 
-                useJUnitJupiter() 
+                useJUnitJupiter()
             }
             integrationTest(JvmTestSuite) {
                 testType = TestSuiteType.INTEGRATION_TEST
@@ -59,18 +61,18 @@ configure(javaProjects) {
         }
     }
 
+    compileJava {
+        options.release = 11
+    }
+
     java {
         archivesBaseName = rootProject.relativeProjectPath(project.path).replace(":", "-")
-        
+
         toolchain {
             languageVersion = JavaLanguageVersion.of(11)
         }
     }
 
-    compileJava {
-        options.release = 8
-    }
-
     javadoc {
         configure(options) {
             tags(
@@ -93,18 +95,4 @@ if (project.hasProperty("ossrh")) {
             }
         }
     }
-}
-
-def isNonStable = { String version ->
-    def nonStableKeyword = ["PREVIEW","ALPHA","BETA", "SNAPSHOT"].any { 
-        it -> version.toUpperCase().contains(it) 
-    }
-    return nonStableKeyword
-}
-tasks.named("dependencyUpdates").configure {
-    rejectVersionIf {
-        isNonStable(it.candidate.version) && !isNonStable(it.currentVersion)
-    }
-    checkForGradleUpdate = true
-    outputFormatter = "html"
 }

core/src/main/java/io/github/joeljeremy7/externalizedproperties/core/ExternalizedProperties.java

@@ -3,6 +3,7 @@
 import io.github.joeljeremy7.externalizedproperties.core.conversion.converters.DefaultConverter;
 import io.github.joeljeremy7.externalizedproperties.core.internal.CachingExternalizedProperties;
 import io.github.joeljeremy7.externalizedproperties.core.internal.InvocationCacheKey;
+import io.github.joeljeremy7.externalizedproperties.core.internal.InvocationHandlerFactory;
 import io.github.joeljeremy7.externalizedproperties.core.internal.SystemExternalizedProperties;
 import io.github.joeljeremy7.externalizedproperties.core.internal.caching.ExpiringCacheStrategy;
 import io.github.joeljeremy7.externalizedproperties.core.internal.caching.WeakConcurrentHashMapCacheStrategy;
@@ -13,7 +14,6 @@
 import io.github.joeljeremy7.externalizedproperties.core.internal.proxy.EagerLoadingInvocationHandlerFactory;
 import io.github.joeljeremy7.externalizedproperties.core.internal.proxy.ExternalizedPropertiesInvocationHandlerFactory;
 import io.github.joeljeremy7.externalizedproperties.core.internal.resolvers.RootResolver;
-import io.github.joeljeremy7.externalizedproperties.core.proxy.InvocationHandlerFactory;
 import io.github.joeljeremy7.externalizedproperties.core.resolvers.DefaultResolver;
 import io.github.joeljeremy7.externalizedproperties.core.resolvers.VariableExpandingResolver;
 import io.github.joeljeremy7.externalizedproperties.core.variableexpansion.NoOpVariableExpander;
@@ -90,7 +90,7 @@ static Builder builder() {
     }
 
     /**
-     * Builder for {@link ExternalizedProperties}.
+     * The builder for {@link ExternalizedProperties}.
      */
     static class Builder implements BuilderConfiguration {
         private final List<ProfilesBuilder> profilesBuilders = new ArrayList<>();

core/src/main/java/io/github/joeljeremy7/externalizedproperties/core/internal/Arguments.java

@@ -41,6 +41,21 @@ public static String requireNonNullOrEmpty(@Nullable String arg, String argName)
         return arg;
     }
 
+    /**
+     * Require argument to not be {@code null} or an empty {@link String}.
+     * 
+     * @param arg The {@link String} argument.
+     * @param argName The name of the {@link String} argument to be used in building the 
+     * {@link IllegalArgumentException} message if the argument failed validation.
+     * @return The {@link String} argument.
+     */
+    public static String requireNonNullOrBlank(@Nullable String arg, String argName) {
+        if (arg == null || arg.chars().allMatch(Character::isWhitespace)) {
+            throw new IllegalArgumentException(argName + " must not be null or empty.");
+        }
+        return arg;
+    }
+
     /**
      * Require argument to not be {@code null} or an empty {@link Collection}.
      * 

…core/proxy/InvocationHandlerFactory.java …e/internal/InvocationHandlerFactory.javacore/src/main/java/io/github/joeljeremy7/externalizedproperties/core/proxy/InvocationHandlerFactory.java renamed to core/src/main/java/io/github/joeljeremy7/externalizedproperties/core/internal/InvocationHandlerFactory.java core/src/main/java/io/github/joeljeremy7/externalizedproperties/core/proxy/InvocationHandlerFactory.java renamed to core/src/main/java/io/github/joeljeremy7/externalizedproperties/core/internal/InvocationHandlerFactory.java

@@ -1,10 +1,9 @@
-package io.github.joeljeremy7.externalizedproperties.core.proxy;
+package io.github.joeljeremy7.externalizedproperties.core.internal;
 
 import io.github.joeljeremy7.externalizedproperties.core.Converter;
 import io.github.joeljeremy7.externalizedproperties.core.InvocationContext;
 import io.github.joeljeremy7.externalizedproperties.core.Resolver;
 import io.github.joeljeremy7.externalizedproperties.core.VariableExpander;
-import io.github.joeljeremy7.externalizedproperties.core.internal.InvocationContextFactory;
 
 import java.lang.reflect.InvocationHandler;
 

core/src/main/java/io/github/joeljeremy7/externalizedproperties/core/internal/SystemExternalizedProperties.java

@@ -9,7 +9,6 @@
 import io.github.joeljeremy7.externalizedproperties.core.TypeReference;
 import io.github.joeljeremy7.externalizedproperties.core.VariableExpander;
 import io.github.joeljeremy7.externalizedproperties.core.VariableExpanderFacade;
-import io.github.joeljeremy7.externalizedproperties.core.proxy.InvocationHandlerFactory;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;

core/src/main/java/io/github/joeljeremy7/externalizedproperties/core/internal/proxy/CachingInvocationHandlerFactory.java

@@ -6,9 +6,9 @@
 import io.github.joeljeremy7.externalizedproperties.core.VariableExpander;
 import io.github.joeljeremy7.externalizedproperties.core.internal.InvocationCacheKey;
 import io.github.joeljeremy7.externalizedproperties.core.internal.InvocationContextFactory;
+import io.github.joeljeremy7.externalizedproperties.core.internal.InvocationHandlerFactory;
 import io.github.joeljeremy7.externalizedproperties.core.internal.caching.WeakConcurrentHashMapCacheStrategy;
 import io.github.joeljeremy7.externalizedproperties.core.internal.caching.WeakHashMapCacheStrategy;
-import io.github.joeljeremy7.externalizedproperties.core.proxy.InvocationHandlerFactory;
 
 import java.lang.reflect.Method;
 

core/src/main/java/io/github/joeljeremy7/externalizedproperties/core/internal/proxy/EagerLoadingInvocationHandlerFactory.java

@@ -6,9 +6,9 @@
 import io.github.joeljeremy7.externalizedproperties.core.VariableExpander;
 import io.github.joeljeremy7.externalizedproperties.core.internal.InvocationCacheKey;
 import io.github.joeljeremy7.externalizedproperties.core.internal.InvocationContextFactory;
+import io.github.joeljeremy7.externalizedproperties.core.internal.InvocationHandlerFactory;
 import io.github.joeljeremy7.externalizedproperties.core.internal.caching.WeakConcurrentHashMapCacheStrategy;
 import io.github.joeljeremy7.externalizedproperties.core.internal.caching.WeakHashMapCacheStrategy;
-import io.github.joeljeremy7.externalizedproperties.core.proxy.InvocationHandlerFactory;
 
 import java.lang.reflect.Method;
 

core/src/main/java/io/github/joeljeremy7/externalizedproperties/core/internal/proxy/ExternalizedPropertiesInvocationHandler.java

@@ -266,7 +266,7 @@ else if ("hashCode".equals(method.getName())) {
             }
         } else if (method.getParameterCount() == 1) {
             if ("equals".equals(method.getName()) && 
-                    method.getParameterTypes()[0].equals(Object.class)) {
+                    Object.class.equals(method.getParameterTypes()[0])) {
                 return proxyEquals(proxy, args);
             }
         }

core/src/main/java/io/github/joeljeremy7/externalizedproperties/core/internal/proxy/ExternalizedPropertiesInvocationHandlerFactory.java

@@ -4,7 +4,7 @@
 import io.github.joeljeremy7.externalizedproperties.core.Resolver;
 import io.github.joeljeremy7.externalizedproperties.core.VariableExpander;
 import io.github.joeljeremy7.externalizedproperties.core.internal.InvocationContextFactory;
-import io.github.joeljeremy7.externalizedproperties.core.proxy.InvocationHandlerFactory;
+import io.github.joeljeremy7.externalizedproperties.core.internal.InvocationHandlerFactory;
 
 /**
  * The factory for {@link ExternalizedPropertiesInvocationHandler}.