Vertx Logger and ConfigProperties was deprecated

quarkus-qe · Jun 1, 2021 · 7153345 · 7153345
1 parent 4f9615a
commit 7153345
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 31 deletions.
diff --git a/022-quarkus-properties-config-all/src/main/java/io/quarkus/qe/GreetingResource.java b/022-quarkus-properties-config-all/src/main/java/io/quarkus/qe/GreetingResource.java
@@ -62,7 +62,7 @@ public String helloAntagonist() {
     @Path("/antagonist/wife")
     @Produces(MediaType.TEXT_PLAIN)
     public String helloAntagonistWife() {
-        return antagonist.wife.name + " says: " + antagonist.wife.message;
+        return antagonist.wife.name() + " says: " + antagonist.wife.message();
     }
 
     @GET

diff --git a/...kus-properties-config-all/src/main/java/io/quarkus/qe/config/AntagonistConfiguration.java b/...kus-properties-config-all/src/main/java/io/quarkus/qe/config/AntagonistConfiguration.java
@@ -1,15 +1,17 @@
 package io.quarkus.qe.config;
 
-import io.quarkus.arc.config.ConfigProperties;
+import io.smallrye.config.ConfigMapping;
 
-@ConfigProperties(prefix = "antagonist")
+@ConfigMapping(prefix = "antagonist")
 public class AntagonistConfiguration {
     public String message;
     public String name;
     public AntagonistWifeConfig wife;
 
-    public static class AntagonistWifeConfig {
-        public String name;
-        public String message;
+    // TODO: https://github.com/quarkusio/quarkus/issues/17545
+    public interface AntagonistWifeConfig {
+        String name();
+
+        String message();
     }
 }
diff --git a/...ies-config-all/src/main/java/io/quarkus/qe/config/interfaces/ProtagonistConfigurable.java b/...ies-config-all/src/main/java/io/quarkus/qe/config/interfaces/ProtagonistConfigurable.java
@@ -2,9 +2,9 @@
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import io.quarkus.arc.config.ConfigProperties;
+import io.smallrye.config.ConfigMapping;
 
-@ConfigProperties(prefix = "protagonist")
+@ConfigMapping(prefix = "protagonist")
 public interface ProtagonistConfigurable extends IBiography {
 
     @ConfigProperty(name = "name")

diff --git a/...tx-webClient/src/main/java/io/quarkus/qe/vertx/webclient/config/VertxWebClientConfig.java b/...tx-webClient/src/main/java/io/quarkus/qe/vertx/webclient/config/VertxWebClientConfig.java
@@ -2,9 +2,9 @@
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import io.quarkus.arc.config.ConfigProperties;
+import io.smallrye.config.ConfigMapping;
 
-@ConfigProperties(prefix = "vertx.webclient")
+@ConfigMapping(prefix = "vertx.webclient")
 public class VertxWebClientConfig {
 
     @ConfigProperty(name = "timeoutSec")

diff --git a/301-quarkus-vertx-kafka/src/main/java/io/quarkus/qe/kafka/config/VertxKProducerConfig.java b/301-quarkus-vertx-kafka/src/main/java/io/quarkus/qe/kafka/config/VertxKProducerConfig.java
@@ -2,15 +2,15 @@
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import io.quarkus.arc.config.ConfigProperties;
+import io.smallrye.config.ConfigMapping;
 
-@ConfigProperties(prefix = "vertx.kafka.producer")
+@ConfigMapping(prefix = "vertx.kafka.producer")
 public class VertxKProducerConfig {
 
-    @ConfigProperty(name = "delayMs")
+    @ConfigProperty(name = "delay-ms")
     public long delay;
 
-    @ConfigProperty(name = "batchSize")
+    @ConfigProperty(name = "batch-size")
     public int batchSize;
 
 }
diff --git a/302-quarkus-vertx-jwt/src/main/java/io/quarkus/qe/vertx/web/auth/AuthN.java b/302-quarkus-vertx-jwt/src/main/java/io/quarkus/qe/vertx/web/auth/AuthN.java
@@ -39,9 +39,9 @@ private PubSecKeyOptions getPubSecKeyOptions() {
     private JWTOptions getJwtOptions() {
         return new JWTOptions()
                 .setIgnoreExpiration(false)
-                .setIssuer(authNConf.claims.iss)
-                .setAudience(Arrays.asList((authNConf.claims.aud)))
-                .setSubject(authNConf.claims.sub)
+                .setIssuer(authNConf.claims.iss())
+                .setAudience(Arrays.asList((authNConf.claims.aud())))
+                .setSubject(authNConf.claims.sub())
                 .setExpiresInMinutes(authNConf.liveSpan)
                 .setAlgorithm(authNConf.alg);
     }

diff --git a/302-quarkus-vertx-jwt/src/main/java/io/quarkus/qe/vertx/web/config/AuthNConfig.java b/302-quarkus-vertx-jwt/src/main/java/io/quarkus/qe/vertx/web/config/AuthNConfig.java
@@ -2,9 +2,9 @@
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import io.quarkus.arc.config.ConfigProperties;
+import io.smallrye.config.ConfigMapping;
 
-@ConfigProperties(prefix = "authN")
+@ConfigMapping(prefix = "authN")
 public class AuthNConfig {
     public String alg;
 
@@ -15,4 +15,12 @@ public class AuthNConfig {
 
     @ConfigProperty(name = "jwt.claims")
     public JwtClaims claims;
+
+    public interface JwtClaims {
+        String iss();
+
+        String sub();
+
+        String aud();
+    }
 }
diff --git a/302-quarkus-vertx-jwt/src/main/java/io/quarkus/qe/vertx/web/config/JwtClaims.java b/302-quarkus-vertx-jwt/src/main/java/io/quarkus/qe/vertx/web/config/JwtClaims.java
diff --git a/303-quarkus-vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/Application.java b/303-quarkus-vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/Application.java
@@ -17,9 +17,9 @@
 import io.quarkus.qe.vertx.sql.services.DbPoolService;
 import io.quarkus.runtime.StartupEvent;
 import io.quarkus.runtime.configuration.ProfileManager;
+import io.vertx.core.impl.logging.Logger;
+import io.vertx.core.impl.logging.LoggerFactory;
 import io.vertx.core.json.jackson.DatabindCodec;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 import io.vertx.mutiny.db2client.DB2Pool;
 import io.vertx.mutiny.mysqlclient.MySQLPool;
 import io.vertx.mutiny.pgclient.PgPool;