From 4201562815204b05a9288245c18e1b5f669d086f Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sun, 4 Feb 2024 21:03:31 +1300 Subject: [PATCH] Rename AWS AppConfig as artifactId avaje-aws-appconfig --- avaje-aws-appconfig/pom.xml | 10 ++++++++-- .../{awsappconfig => appconfig}/AppConfigFetcher.java | 2 +- .../AppConfigPlugin.java} | 9 +++++---- .../{awsappconfig => appconfig}/DAppConfigFetcher.java | 2 +- .../config/{awsappconfig => appconfig}/DResult.java | 2 +- avaje-aws-appconfig/src/main/java/module-info.java | 9 +++++---- .../services/io.avaje.config.ConfigurationSource | 2 +- 7 files changed, 22 insertions(+), 14 deletions(-) rename avaje-aws-appconfig/src/main/java/io/avaje/config/{awsappconfig => appconfig}/AppConfigFetcher.java (94%) rename avaje-aws-appconfig/src/main/java/io/avaje/config/{awsappconfig/AwsAppConfigPlugin.java => appconfig/AppConfigPlugin.java} (94%) rename avaje-aws-appconfig/src/main/java/io/avaje/config/{awsappconfig => appconfig}/DAppConfigFetcher.java (98%) rename avaje-aws-appconfig/src/main/java/io/avaje/config/{awsappconfig => appconfig}/DResult.java (93%) diff --git a/avaje-aws-appconfig/pom.xml b/avaje-aws-appconfig/pom.xml index e0339ab..3f2f0bc 100644 --- a/avaje-aws-appconfig/pom.xml +++ b/avaje-aws-appconfig/pom.xml @@ -11,14 +11,20 @@ io.avaje - avaje-config-aws-appconfig - 0.3 + avaje-aws-appconfig + 0.4 false + + io.avaje + avaje-applog + 1.0 + + io.avaje avaje-config diff --git a/avaje-aws-appconfig/src/main/java/io/avaje/config/awsappconfig/AppConfigFetcher.java b/avaje-aws-appconfig/src/main/java/io/avaje/config/appconfig/AppConfigFetcher.java similarity index 94% rename from avaje-aws-appconfig/src/main/java/io/avaje/config/awsappconfig/AppConfigFetcher.java rename to avaje-aws-appconfig/src/main/java/io/avaje/config/appconfig/AppConfigFetcher.java index 29e147f..4ca0651 100644 --- a/avaje-aws-appconfig/src/main/java/io/avaje/config/awsappconfig/AppConfigFetcher.java +++ b/avaje-aws-appconfig/src/main/java/io/avaje/config/appconfig/AppConfigFetcher.java @@ -1,4 +1,4 @@ -package io.avaje.config.awsappconfig; +package io.avaje.config.appconfig; interface AppConfigFetcher { diff --git a/avaje-aws-appconfig/src/main/java/io/avaje/config/awsappconfig/AwsAppConfigPlugin.java b/avaje-aws-appconfig/src/main/java/io/avaje/config/appconfig/AppConfigPlugin.java similarity index 94% rename from avaje-aws-appconfig/src/main/java/io/avaje/config/awsappconfig/AwsAppConfigPlugin.java rename to avaje-aws-appconfig/src/main/java/io/avaje/config/appconfig/AppConfigPlugin.java index b873ae9..03ac8b1 100644 --- a/avaje-aws-appconfig/src/main/java/io/avaje/config/awsappconfig/AwsAppConfigPlugin.java +++ b/avaje-aws-appconfig/src/main/java/io/avaje/config/appconfig/AppConfigPlugin.java @@ -1,5 +1,6 @@ -package io.avaje.config.awsappconfig; +package io.avaje.config.appconfig; +import io.avaje.applog.AppLog; import io.avaje.config.ConfigParser; import io.avaje.config.Configuration; import io.avaje.config.ConfigurationSource; @@ -17,9 +18,9 @@ *

* By default, will periodically reload the configuration if it has changed. */ -public final class AwsAppConfigPlugin implements ConfigurationSource { +public final class AppConfigPlugin implements ConfigurationSource { - private static final System.Logger log = System.getLogger("io.avaje.config.AwsAppConfig"); + private static final System.Logger log = AppLog.getLogger("io.avaje.config.AwsAppConfig"); private Loader loader; @@ -86,7 +87,7 @@ void reload() { } private boolean reloadRequired() { - return validUntil.get().isAfter(Instant.now()); + return validUntil.get().isBefore(Instant.now()); } private void performReload() { diff --git a/avaje-aws-appconfig/src/main/java/io/avaje/config/awsappconfig/DAppConfigFetcher.java b/avaje-aws-appconfig/src/main/java/io/avaje/config/appconfig/DAppConfigFetcher.java similarity index 98% rename from avaje-aws-appconfig/src/main/java/io/avaje/config/awsappconfig/DAppConfigFetcher.java rename to avaje-aws-appconfig/src/main/java/io/avaje/config/appconfig/DAppConfigFetcher.java index 8281903..da1ecf5 100644 --- a/avaje-aws-appconfig/src/main/java/io/avaje/config/awsappconfig/DAppConfigFetcher.java +++ b/avaje-aws-appconfig/src/main/java/io/avaje/config/appconfig/DAppConfigFetcher.java @@ -1,4 +1,4 @@ -package io.avaje.config.awsappconfig; +package io.avaje.config.appconfig; import java.io.IOException; import java.net.URI; diff --git a/avaje-aws-appconfig/src/main/java/io/avaje/config/awsappconfig/DResult.java b/avaje-aws-appconfig/src/main/java/io/avaje/config/appconfig/DResult.java similarity index 93% rename from avaje-aws-appconfig/src/main/java/io/avaje/config/awsappconfig/DResult.java rename to avaje-aws-appconfig/src/main/java/io/avaje/config/appconfig/DResult.java index f387e75..a6e939e 100644 --- a/avaje-aws-appconfig/src/main/java/io/avaje/config/awsappconfig/DResult.java +++ b/avaje-aws-appconfig/src/main/java/io/avaje/config/appconfig/DResult.java @@ -1,4 +1,4 @@ -package io.avaje.config.awsappconfig; +package io.avaje.config.appconfig; final class DResult implements AppConfigFetcher.Result { diff --git a/avaje-aws-appconfig/src/main/java/module-info.java b/avaje-aws-appconfig/src/main/java/module-info.java index d30d949..c36cf6c 100644 --- a/avaje-aws-appconfig/src/main/java/module-info.java +++ b/avaje-aws-appconfig/src/main/java/module-info.java @@ -1,10 +1,11 @@ -import io.avaje.config.awsappconfig.AwsAppConfigPlugin; +import io.avaje.config.appconfig.AppConfigPlugin; -module io.avaje.config.awsappconfig { +module io.avaje.config.appconfig { - exports io.avaje.config.awsappconfig; + exports io.avaje.config.appconfig; requires io.avaje.config; requires java.net.http; - provides io.avaje.config.ConfigurationSource with AwsAppConfigPlugin; + requires transitive io.avaje.applog; + provides io.avaje.config.ConfigurationSource with AppConfigPlugin; } diff --git a/avaje-aws-appconfig/src/main/resources/META-INF/services/io.avaje.config.ConfigurationSource b/avaje-aws-appconfig/src/main/resources/META-INF/services/io.avaje.config.ConfigurationSource index 53b7519..9b14361 100644 --- a/avaje-aws-appconfig/src/main/resources/META-INF/services/io.avaje.config.ConfigurationSource +++ b/avaje-aws-appconfig/src/main/resources/META-INF/services/io.avaje.config.ConfigurationSource @@ -1 +1 @@ -io.avaje.config.awsappconfig.AwsAppConfigPlugin +io.avaje.config.appconfig.AppConfigPlugin