diff --git a/conference-provider/src/main/docker/Dockerfile.jvm b/conference-provider/src/main/docker/Dockerfile.jvm index 182c455..d8061dd 100644 --- a/conference-provider/src/main/docker/Dockerfile.jvm +++ b/conference-provider/src/main/docker/Dockerfile.jvm @@ -7,7 +7,7 @@ # # Then, build the image with: # -# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/quarkus-approximation-corrector-en-provider-jvm . +# docker build -f src/main/docker/Dockerfile.jvm -t quay.io/jtama/acme-provider:jvm . # # Then run the container using: # diff --git a/conference-provider/src/main/docker/Dockerfile.legacy-jar b/conference-provider/src/main/docker/Dockerfile.legacy-jar deleted file mode 100644 index e895e83..0000000 --- a/conference-provider/src/main/docker/Dockerfile.legacy-jar +++ /dev/null @@ -1,89 +0,0 @@ -#### -# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode -# -# Before building the container image run: -# -# ./mvnw package -Dquarkus.package.type=legacy-jar -# -# Then, build the image with: -# -# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/quarkus-approximation-corrector-en-provider-legacy-jar . -# -# Then run the container using: -# -# docker run -i --rm -p 8080:8080 quarkus/quarkus-approximation-corrector-en-provider-legacy-jar -# -# If you want to include the debug port into your docker image -# you will have to expose the debug port (default 5005) like this : EXPOSE 8080 5005 -# -# Then run the container using : -# -# docker run -i --rm -p 8080:8080 quarkus/quarkus-approximation-corrector-en-provider-legacy-jar -# -# This image uses the `run-java.sh` script to run the application. -# This scripts computes the command line to execute your Java application, and -# includes memory/GC tuning. -# You can configure the behavior using the following environment properties: -# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") -# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options -# in JAVA_OPTS (example: "-Dsome.property=foo") -# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is -# used to calculate a default maximal heap memory based on a containers restriction. -# If used in a container without any memory constraints for the container then this -# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio -# of the container available memory as set here. The default is `50` which means 50% -# of the available memory is used as an upper boundary. You can skip this mechanism by -# setting this value to `0` in which case no `-Xmx` option is added. -# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This -# is used to calculate a default initial heap memory based on the maximum heap memory. -# If used in a container without any memory constraints for the container then this -# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio -# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` -# is used as the initial heap size. You can skip this mechanism by setting this value -# to `0` in which case no `-Xms` option is added (example: "25") -# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS. -# This is used to calculate the maximum value of the initial heap memory. If used in -# a container without any memory constraints for the container then this option has -# no effect. If there is a memory constraint then `-Xms` is limited to the value set -# here. The default is 4096MB which means the calculated value of `-Xms` never will -# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096") -# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output -# when things are happening. This option, if set to true, will set -# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true"). -# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example: -# true"). -# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787"). -# - CONTAINER_CORE_LIMIT: A calculated core limit as described in -# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2") -# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024"). -# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion. -# (example: "20") -# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking. -# (example: "40") -# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection. -# (example: "4") -# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus -# previous GC times. (example: "90") -# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20") -# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100") -# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should -# contain the necessary JRE command-line options to specify the required GC, which -# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC). -# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080") -# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080") -# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be -# accessed directly. (example: "foo.example.com,bar.example.com") -# -### -FROM registry.access.redhat.com/ubi8/openjdk-17:1.14 - -ENV LANGUAGE='en_US:en' - - -COPY target/lib/* /deployments/lib/ -COPY target/*-runner.jar /deployments/quarkus-run.jar - -EXPOSE 8080 -USER 185 -ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" -ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" diff --git a/conference-provider/src/main/docker/Dockerfile.native b/conference-provider/src/main/docker/Dockerfile.native deleted file mode 100644 index dab5e49..0000000 --- a/conference-provider/src/main/docker/Dockerfile.native +++ /dev/null @@ -1,27 +0,0 @@ -#### -# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. -# -# Before building the container image run: -# -# ./mvnw package -Pnative -# -# Then, build the image with: -# -# docker build -f src/main/docker/Dockerfile.native -t quarkus/quarkus-approximation-corrector-en-provider . -# -# Then run the container using: -# -# docker run -i --rm -p 8080:8080 quarkus/quarkus-approximation-corrector-en-provider -# -### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6 -WORKDIR /work/ -RUN chown 1001 /work \ - && chmod "g+rwX" /work \ - && chown 1001:root /work -COPY --chown=1001:root target/*-runner /work/application - -EXPOSE 8080 -USER 1001 - -CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] diff --git a/conference-provider/src/main/docker/Dockerfile.native-micro b/conference-provider/src/main/docker/Dockerfile.native-micro index 3d261ef..3221589 100644 --- a/conference-provider/src/main/docker/Dockerfile.native-micro +++ b/conference-provider/src/main/docker/Dockerfile.native-micro @@ -10,11 +10,11 @@ # # Then, build the image with: # -# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/quarkus-approximation-corrector-en-provider . +# docker build -f src/main/docker/Dockerfile.native-micro -t quay.io/jtama/acme-provider:native . # # Then run the container using: # -# docker run -i --rm -p 8080:8080 quarkus/quarkus-approximation-corrector-en-provider +# docker run -i --rm -p 8080:8080 quay.io/jtama/acme-provider:native # ### FROM quay.io/quarkus/quarkus-micro-image:2.0 diff --git a/conference-provider/src/main/java/org/acme/ConferencesResource.java b/conference-provider/src/main/java/org/acme/ConferencesResource.java index 903ec62..570b66a 100644 --- a/conference-provider/src/main/java/org/acme/ConferencesResource.java +++ b/conference-provider/src/main/java/org/acme/ConferencesResource.java @@ -17,8 +17,10 @@ public class ConferencesResource { static { conferences = new HashMap<>(Map.of( + "maryCoreTech", new Conference("A mandonné, ça fatigue !", "Myra Cool"), + "daminouTech", new Conference("Tchou la bise !", "Super Daminou"), "snowcamp", new Conference("Quarkus: Greener, Better, Faster, Stronger", "j.tama"), - "devoxxFR", new Conference("#RetourAuxSources : Le cache HTTP", "h.sablonnière ❤"), + "devoxxFR", new Conference("#RetourAuxSources : Le cache HTTP", "Hubert Sablonnière ❤"), "dummy", new Conference("Why does Elmyra Duff love animals so much ?", "Malvin le Martien") )); } diff --git a/conference-provider/src/main/resources/META-INF/resources/index.html b/conference-provider/src/main/resources/META-INF/resources/index.html deleted file mode 100644 index 347bace..0000000 --- a/conference-provider/src/main/resources/META-INF/resources/index.html +++ /dev/null @@ -1,283 +0,0 @@ - - - - - quarkus-approximation-corrector-en-provider - 1.0.0-SNAPSHOT - - - -
-
-
- - - - - quarkus_logo_horizontal_rgb_1280px_reverse - - - - - - - - - - - - - - - - - - -
-
-
- -
-
-
-

You just made a Quarkus application.

-

This page is served by Quarkus.

- Visit the Dev UI -

This page: src/main/resources/META-INF/resources/index.html

-

App configuration: src/main/resources/application.properties

-

Static assets: src/main/resources/META-INF/resources/

-

Code: src/main/java

-

Generated starter code:

-
    -
  • - RESTEasy Reactive Easily start your Reactive RESTful Web Services -
    › @Path: /hello -
    › Related guide -
    • - -
-
-
-

Selected extensions

-
    -
  • RESTEasy Reactive (guide)
    • -
-
Documentation
-

Practical step-by-step guides to help you achieve a specific goal. Use them to help get your work - done.

-
Set up your IDE
-

Everyone has a favorite IDE they like to use to code. Learn how to configure yours to maximize your - Quarkus productivity.

-
-
-
- - diff --git a/conference-provider/src/test/java/org/acme/ConferencesResourceTest.java b/conference-provider/src/test/java/org/acme/ConferencesResourceTest.java index 01e3069..dfb236a 100644 --- a/conference-provider/src/test/java/org/acme/ConferencesResourceTest.java +++ b/conference-provider/src/test/java/org/acme/ConferencesResourceTest.java @@ -13,16 +13,29 @@ public class ConferencesResourceTest { @Test - public void testHelloEndpoint() { - Map> result = given() - .when().get("/conferences") + public void testUnknownConference() { + ConferencesResource.Conference result = given() + .when().get("/conferences/unknown") .then() .statusCode(200) .extract() .body() - .as(Map.class); - Assertions.assertEquals("Quarkus: Greener, Better, Faster, Stronger", result.get("snowcamp").get("title")); - Assertions.assertEquals("#RetourAuxSources : Le cache HTTP", result.get("devoxxFR").get("title")); + .as(ConferencesResource.Conference.class); + Assertions.assertEquals("Always Look on the Bright Side of Life", result.title()); + Assertions.assertEquals("Monty Python", result.author()); + } + + @Test + public void testDummyConference() { + ConferencesResource.Conference result = given() + .when().get("/conferences/dummy") + .then() + .statusCode(200) + .extract() + .body() + .as(ConferencesResource.Conference.class); + Assertions.assertEquals("Why does Elmyra Duff love animals so much ?", result.title()); + Assertions.assertEquals("Malvin le Martien", result.author()); } } diff --git a/deployment/src/main/java/org/acme/configurationProvider/deployment/AcmeConfigurationBuildTimeConfiguration.java b/deployment/src/main/java/org/acme/configurationProvider/deployment/AcmeConfigurationBuildTimeConfiguration.java index b6dcd98..cda4a1f 100644 --- a/deployment/src/main/java/org/acme/configurationProvider/deployment/AcmeConfigurationBuildTimeConfiguration.java +++ b/deployment/src/main/java/org/acme/configurationProvider/deployment/AcmeConfigurationBuildTimeConfiguration.java @@ -5,7 +5,7 @@ import io.quarkus.runtime.annotations.ConfigRoot; import org.acme.configurationProvider.deployment.devservice.DevServicesConfig; -@ConfigRoot(prefix = "acme", name = ConfigItem.PARENT, phase = ConfigPhase.BUILD_TIME) +@ConfigRoot(prefix = "acme", name = "", phase = ConfigPhase.BUILD_TIME) public class AcmeConfigurationBuildTimeConfiguration { /** diff --git a/deployment/src/main/java/org/acme/configurationProvider/deployment/DevServiceProcessor.java b/deployment/src/main/java/org/acme/configurationProvider/deployment/DevServiceProcessor.java deleted file mode 100644 index a4636cf..0000000 --- a/deployment/src/main/java/org/acme/configurationProvider/deployment/DevServiceProcessor.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.acme.configurationProvider.deployment; - -public class DevServiceProcessor { -} diff --git a/deployment/src/main/java/org/acme/configurationProvider/deployment/EnvironmentInjectorProcessor.java b/deployment/src/main/java/org/acme/configurationProvider/deployment/EnvironmentInjectorProcessor.java index 4aa25e0..6c292c6 100644 --- a/deployment/src/main/java/org/acme/configurationProvider/deployment/EnvironmentInjectorProcessor.java +++ b/deployment/src/main/java/org/acme/configurationProvider/deployment/EnvironmentInjectorProcessor.java @@ -22,7 +22,7 @@ void askForAppllicationScan(ApplicationIndexBuildItem index, .stream() .map(AnnotationInstance::values) .flatMap(List::stream) - .filter(value -> value.asString().startsWith("acme")) + .filter(value -> value.asString().startsWith("env.")) .findFirst() .ifPresent(annotationInstance -> buildProducer.produce(new AcmeEnvironmentBuildItem())); } diff --git a/deployment/src/main/java/org/acme/configurationProvider/deployment/NoUtilsClassTransformerProcessor.java b/deployment/src/main/java/org/acme/configurationProvider/deployment/NoUtilsClassTransformerProcessor.java index ffdd5ab..0ccd23c 100644 --- a/deployment/src/main/java/org/acme/configurationProvider/deployment/NoUtilsClassTransformerProcessor.java +++ b/deployment/src/main/java/org/acme/configurationProvider/deployment/NoUtilsClassTransformerProcessor.java @@ -2,9 +2,12 @@ import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.ApplicationIndexBuildItem; import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem; import io.quarkus.gizmo.Gizmo; +import org.acme.configurationProvider.runtime.UtilsAreBadLogger; import org.jboss.logging.Logger; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.MethodVisitor; @@ -17,20 +20,29 @@ * Please clearly state what your class is doing... */ class NoUtilsClassTransformerProcessor { + private static final Logger logger = Logger.getLogger(NoUtilsClassTransformerProcessor.class); @BuildStep + @Record(ExecutionTime.RUNTIME_INIT) public void build(ApplicationIndexBuildItem applicationIndex, - BuildProducer transformers) { + AcmeConfigurationBuildTimeConfiguration compileConfiguration, + BuildProducer transformers, + UtilsAreBadLogger utilsAreBadLogger) { List utilsClasses = applicationIndex.getIndex() .getKnownClasses() .stream() .filter(info -> info.name().toString().endsWith("Utils")) .map(info -> info.name().toString()) .toList(); - for (String className : utilsClasses) { - transformers.produce(new BytecodeTransformerBuildItem(className, - (name, classVisitor) -> new NoUtilsClassVisitor(Gizmo.ASM_API_VERSION, classVisitor))); + if (compileConfiguration.strict.isUtilsStrict) { + logger.infof("Someone may not be happy in the future, but you were warned..."); + for (String className : utilsClasses) { + transformers.produce(new BytecodeTransformerBuildItem(className, + (name, classVisitor) -> new NoUtilsClassVisitor(Gizmo.ASM_API_VERSION, classVisitor))); + } + return; } + utilsAreBadLogger.nope(utilsClasses); } private static class NoUtilsClassVisitor extends ClassVisitor { @@ -50,8 +62,6 @@ public void visit( final String[] interfaces) { super.visit(version, access, name, signature, superName, interfaces); - logger.warnf("💀 I told you not do this!", name); - logger.warnf("💀 Your code will panic at runtime -> %s", name); MethodVisitor mv = visitMethod(Opcodes.ACC_PRIVATE + Opcodes.ACC_STATIC, "", "()V", null, null); diff --git a/deployment/src/main/java/org/acme/configurationProvider/deployment/ThisIsNotRestTransformerProcessor.java b/deployment/src/main/java/org/acme/configurationProvider/deployment/ThisIsNotRestTransformerProcessor.java index ca99600..992368c 100644 --- a/deployment/src/main/java/org/acme/configurationProvider/deployment/ThisIsNotRestTransformerProcessor.java +++ b/deployment/src/main/java/org/acme/configurationProvider/deployment/ThisIsNotRestTransformerProcessor.java @@ -45,63 +45,60 @@ class ThisIsNotRestTransformerProcessor { public void warn( AcmeConfigurationBuildTimeConfiguration compileConfiguration, ApplicationIndexBuildItem applicationIndexBuildItem, + BuildProducer transformers, ThisIsNotRestLogger thisIsNotRestLogger) { if (compileConfiguration.strict.isRestStrict) { + logger.infof("Correcting your approximations if any. We'll see at runtime !"); + transformers.produce(new AnnotationsTransformerBuildItem(new RestMethodCorrector(compileConfiguration))); return; } Stream restEndpoints = applicationIndexBuildItem.getIndex().getKnownClasses().stream() .flatMap(classInfo -> classInfo.methods().stream()) .filter(isRestEndpoint); - thisIsNotRestLogger.youAreNotDoingREST(restEndpoints .map(methodInfo -> "You think you method \"%s#%s\" is doing rest but it's more JSON over HTTP actually.".formatted(methodInfo.declaringClass().toString(), methodInfo.toString())) .toList()); } - @BuildStep(onlyIf = ReactiveResteasyEnabled.class) - public void process( - AcmeConfigurationBuildTimeConfiguration compileConfiguration, - BuildProducer transformers) { - if (!compileConfiguration.strict.isRestStrict) { - return; + public static class ReactiveResteasyEnabled implements BooleanSupplier { + @Override + public boolean getAsBoolean() { + return QuarkusClassLoader.isClassPresentAtRuntime("org.jboss.resteasy.reactive.ResponseHeader"); } - logger.infof("Correcting your approximations if any."); - transformers.produce(new AnnotationsTransformerBuildItem(new AnnotationsTransformer() { - - private final boolean mustRecordWarning = true; + } - @Override - public boolean appliesTo(AnnotationTarget.Kind kind) { - return AnnotationTarget.Kind.METHOD == kind; - } + private class RestMethodCorrector implements AnnotationsTransformer { - @Override - public void transform(TransformationContext context) { - MethodInfo method = context.getTarget().asMethod(); - if (isRestEndpoint.test(method)) { - if (!compileConfiguration.strict.isRestStrict) { + private final boolean mustRecordWarning = true; + private AcmeConfigurationBuildTimeConfiguration compileConfiguration; - } - Transformation transform = context.transform(); - transform.add(DotName.createSimple(ResponseHeader.class), - AnnotationValue.createStringValue("name", "X-ApproximationCorrector"), - AnnotationValue.createArrayValue("value", Collections - .singletonList(AnnotationValue.createStringValue("", "It's more JSON over http really.")))); - transform.done(); - if (mustRecordWarning) { + private RestMethodCorrector(AcmeConfigurationBuildTimeConfiguration compileConfiguration) { + this.compileConfiguration = compileConfiguration; + } - } - } - } + @Override + public boolean appliesTo(AnnotationTarget.Kind kind) { + return AnnotationTarget.Kind.METHOD == kind; + } - })); + @Override + public void transform(AnnotationsTransformer.TransformationContext context) { + MethodInfo method = context.getTarget().asMethod(); + if (isRestEndpoint.test(method)) { + if (!compileConfiguration.strict.isRestStrict) { - } + } + Transformation transform = context.transform(); + transform.add(DotName.createSimple(ResponseHeader.class), + AnnotationValue.createStringValue("name", "X-ApproximationCorrector"), + AnnotationValue.createArrayValue("value", Collections + .singletonList(AnnotationValue.createStringValue("", "It's more JSON over http really.")))); + transform.done(); + if (mustRecordWarning) { - public static class ReactiveResteasyEnabled implements BooleanSupplier { - @Override - public boolean getAsBoolean() { - return QuarkusClassLoader.isClassPresentAtRuntime("org.jboss.resteasy.reactive.ResponseHeader"); + } + } } + } } diff --git a/deployment/src/main/java/org/acme/configurationProvider/deployment/devservice/DevServicesConfig.java b/deployment/src/main/java/org/acme/configurationProvider/deployment/devservice/DevServicesConfig.java index cff6258..8f2cf0b 100644 --- a/deployment/src/main/java/org/acme/configurationProvider/deployment/devservice/DevServicesConfig.java +++ b/deployment/src/main/java/org/acme/configurationProvider/deployment/devservice/DevServicesConfig.java @@ -2,10 +2,6 @@ import io.quarkus.runtime.annotations.ConfigGroup; import io.quarkus.runtime.annotations.ConfigItem; -import io.quarkus.runtime.annotations.ConfigPhase; -import io.quarkus.runtime.annotations.ConfigRoot; - -import java.util.Optional; @ConfigGroup public class DevServicesConfig { @@ -14,18 +10,19 @@ public class DevServicesConfig { * Enable or disable Dev Services explicitly. Dev Services are automatically enabled unless {@code acme.environment.url} is * set. */ - @ConfigItem - public Optional enabled = Optional.empty(); + @ConfigItem(defaultValue = "true") + public Boolean enabled; /** * The Acme configuration value provider container image to use. - * + *

* [INFO] * ==== * Details about default image on https://quay.io/repository/jtama/acme-provider/manifest/sha256:3eca3fe7aedf4bfe8b3213b67c3449c87bc2ab10ae264f681d429ca6c274471f?tab=layers[Docker Repository on Quay] * ==== + * * @asciidoclet */ - @ConfigItem(defaultValue = "quay.io/jtama/acme-provider") + @ConfigItem(defaultValue = "quay.io/jtama/acme-provider:native") public String imageName; } diff --git a/deployment/src/main/java/org/acme/configurationProvider/deployment/devservice/DevServicesProcessor.java b/deployment/src/main/java/org/acme/configurationProvider/deployment/devservice/DevServicesProcessor.java index 98773a4..c787fc6 100644 --- a/deployment/src/main/java/org/acme/configurationProvider/deployment/devservice/DevServicesProcessor.java +++ b/deployment/src/main/java/org/acme/configurationProvider/deployment/devservice/DevServicesProcessor.java @@ -15,7 +15,6 @@ import io.quarkus.devservices.common.ContainerLocator; import io.quarkus.runtime.configuration.ConfigUtils; import org.acme.configurationProvider.deployment.AcmeConfigurationBuildTimeConfiguration; -import org.acme.configurationProvider.deployment.AcmeConfigurationProviderProcessor$$accessor; import org.jboss.logging.Logger; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; @@ -33,10 +32,10 @@ public class DevServicesProcessor { * This allows other applications to discover the running service and use it instead of starting a new instance. */ static final String DEV_SERVICE_LABEL = "acme-env-dev-service"; - static final int MINIO_PORT = 8080; + static final int ACME_PORT = 8080; private static final Logger LOGGER = Logger.getLogger(DevServicesProcessor.class); private static final String ACME_ENV_URL_KEY = "acme.environment.url"; - private static final ContainerLocator acmeEnvContainerLocator = new ContainerLocator(DEV_SERVICE_LABEL, MINIO_PORT); + private static final ContainerLocator acmeEnvContainerLocator = new ContainerLocator(DEV_SERVICE_LABEL, ACME_PORT); static volatile DevServicesResultBuildItem.RunningDevService devService; static volatile boolean first = true; @@ -113,8 +112,8 @@ private DevServicesResultBuildItem.RunningDevService startAcmeEnv( DockerStatusBuildItem dockerStatusBuildItem, LaunchModeBuildItem launchMode, Optional timeout, - DevServicesConfig buildTimeConfiguration) { - if (!buildTimeConfiguration.enabled.orElse(true)) { + DevServicesConfig devServicesConfig) { + if (!devServicesConfig.enabled) { // explicitly disabled LOGGER.debug("Not starting dev services for AcmeEnv, as it has been disabled in the config."); return null; @@ -138,7 +137,7 @@ private DevServicesResultBuildItem.RunningDevService startAcmeEnv( // Starting the server final Supplier defaultAcmeEnvBrokerSupplier = () -> { AcmeEnvContainer container = new AcmeEnvContainer( - DockerImageName.parse(buildTimeConfiguration.imageName)); + DockerImageName.parse(devServicesConfig.imageName)); ConfigureUtil.configureSharedNetwork(container, "acmeEnv"); container.withLabel(DEV_SERVICE_LABEL, DEV_SERVICE_LABEL); @@ -169,11 +168,11 @@ private static final class AcmeEnvContainer extends GenericContainer> confByEvent; + + AcmeResource(@ConfigProperty(name = "env.devoxxFR.title") + String devoxxFRConfTitle, + @ConfigProperty(name = "env.devoxxFR.author") + String devoxxFRConfAuthor, + @ConfigProperty(name = "env.snowcamp.title") + String snowcampConfTitle, + @ConfigProperty(name = "env.snowcamp.author") + String snowcampConfAuthor, + @ConfigProperty(name = "env.maryCoreTech.title") + String maryCoreTechConfTitle, + @ConfigProperty(name = "env.maryCoreTech.author") + String maryCoreTechConfAuthor, + @ConfigProperty(name = "env.daminouTech.title") + String daminouTechConfTitle, + @ConfigProperty(name = "env.daminouTech.author") + String daminouTechConfAuthor, + @ConfigProperty(name = "env.dummy.title") + String dummyConfTitle, + @ConfigProperty(name = "env.dummy.author") + String dummyConfAuthor) { + confByEvent = Map.of("devoxxFR", Map.of("title", devoxxFRConfTitle, "author", devoxxFRConfAuthor), + "maryCoreTech", Map.of("title", maryCoreTechConfTitle, "author", maryCoreTechConfAuthor), + "snowcamp", Map.of("title", snowcampConfTitle, "author", snowcampConfAuthor), + "daminouTech", Map.of("title", daminouTechConfTitle, "author", daminouTechConfAuthor), + "dummy", Map.of("title", dummyConfTitle, "author", dummyConfAuthor)); } - @Path("/bdxio") + @Path("/{event}") @GET - public String helloBdxio() { - return hello(bdxIOConfAuthor, bdxIOConfTitle); + public String hellodevoxxFR(String event) { + return hello(confByEvent.get(event)); } @GET public String hello() { - return hello(dummyConfAuthor, dummyConfTitle); + return hello(confByEvent.get("dummy")); } - private String hello(String conferenceAuthor, String talkTitle) { - return "Welcome %s, that will present: \"%s\"".formatted(conferenceAuthor, talkTitle); + private String hello(Map conf) { + return "Welcome %s, that will present: \"%s\"".formatted(conf.get("author"), conf.get("title")); } } diff --git a/integration-tests/src/main/java/org/acme/configurationProvider/it/CustomResourceUtils.java b/integration-tests/src/main/java/org/acme/configurationProvider/it/CustomResourceUtils.java index bd21f63..587d880 100644 --- a/integration-tests/src/main/java/org/acme/configurationProvider/it/CustomResourceUtils.java +++ b/integration-tests/src/main/java/org/acme/configurationProvider/it/CustomResourceUtils.java @@ -16,10 +16,15 @@ */ package org.acme.configurationProvider.it; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; + +@Path("/utils") public class CustomResourceUtils { // add some rest methods here - public static String hello() { + @GET + public String hello() { return "Hello custom"; } } diff --git a/integration-tests/src/main/resources/application.properties b/integration-tests/src/main/resources/application.properties new file mode 100644 index 0000000..ddd6818 --- /dev/null +++ b/integration-tests/src/main/resources/application.properties @@ -0,0 +1 @@ +acme.devservices.enabled=false \ No newline at end of file diff --git a/runtime/src/main/java/org/acme/configurationProvider/runtime/AcmeConfigSource.java b/runtime/src/main/java/org/acme/configurationProvider/runtime/AcmeConfigSource.java index 57aefde..74acb7a 100644 --- a/runtime/src/main/java/org/acme/configurationProvider/runtime/AcmeConfigSource.java +++ b/runtime/src/main/java/org/acme/configurationProvider/runtime/AcmeConfigSource.java @@ -17,14 +17,12 @@ public class AcmeConfigSource implements ConfigSource { private final Pattern patternMatcher; - private final Predicate isAcme = key -> key.startsWith("acme."); - - private final Predicate isProviderConfiguration = key -> key.equals("acme.environment.url"); + private final Predicate isAcme = key -> key.startsWith("env."); public AcmeConfigSource(EnvironmentRuntimeConfiguration runtimeConfiguration) { environmentProviderClient = new EnvironmentProviderClient(runtimeConfiguration.url()); - String pattern = "acme\\.(?.*)\\.(?.*)"; + String pattern = "env.(?.*)\\.(?.*)"; // Create a Pattern object patternMatcher = Pattern.compile(pattern); @@ -53,7 +51,6 @@ public int getOrdinal() { @Override public String getValue(String propertyName) { if (Predicate.not(isAcme) - .or(isProviderConfiguration) .test(propertyName)) return null; diff --git a/runtime/src/main/java/org/acme/configurationProvider/runtime/EnvironmentProviderClient.java b/runtime/src/main/java/org/acme/configurationProvider/runtime/EnvironmentProviderClient.java index 0a7f064..86b5694 100644 --- a/runtime/src/main/java/org/acme/configurationProvider/runtime/EnvironmentProviderClient.java +++ b/runtime/src/main/java/org/acme/configurationProvider/runtime/EnvironmentProviderClient.java @@ -17,7 +17,7 @@ class EnvironmentProviderClient { uriBuilder = UriBuilder.fromUri(baseUrl).path("/conferences/{prefix}"); } - Map getEnvironment(String prefix) { + public Map getEnvironment(String prefix) { return restClient.target(uriBuilder.build(prefix)).request().get(Map.class); } } diff --git a/runtime/src/main/java/org/acme/configurationProvider/runtime/UtilsAreBadLogger.java b/runtime/src/main/java/org/acme/configurationProvider/runtime/UtilsAreBadLogger.java index b93333b..3f1773b 100644 --- a/runtime/src/main/java/org/acme/configurationProvider/runtime/UtilsAreBadLogger.java +++ b/runtime/src/main/java/org/acme/configurationProvider/runtime/UtilsAreBadLogger.java @@ -10,10 +10,9 @@ public class UtilsAreBadLogger { private static final Logger logger = Logger.getLogger(UtilsAreBadLogger.class); - public void youAreNotDoingREST(List warnings) { - logger.error(String.join(System.lineSeparator(), warnings)); - - logger.error("If I had been stricter I would have changed your code..."); + public void nope(List warnings) { + logger.error("💀 I told you not do this!"); + logger.errorf("💀 Would have I been stricter your code would have panic at runtime. Here : %s%s", System.lineSeparator(), String.join(System.lineSeparator(), warnings)); } } diff --git a/runtime/src/main/java/org/acme/configurationProvider/runtime/config/AcmeConfigBuildItemCustomizer.java b/runtime/src/main/java/org/acme/configurationProvider/runtime/config/AcmeConfigBuildItemCustomizer.java index a89976e..1e473df 100644 --- a/runtime/src/main/java/org/acme/configurationProvider/runtime/config/AcmeConfigBuildItemCustomizer.java +++ b/runtime/src/main/java/org/acme/configurationProvider/runtime/config/AcmeConfigBuildItemCustomizer.java @@ -6,6 +6,6 @@ public class AcmeConfigBuildItemCustomizer implements SmallRyeConfigBuilderCustomizer { @Override public void configBuilder(SmallRyeConfigBuilder builder) { - builder.withMappingIgnore("acme.strict.**"); + builder.withMappingIgnore("acme.**"); } } diff --git a/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/runtime/src/main/resources/META-INF/quarkus-extension.yaml index b0796dd..3c4d1a5 100644 --- a/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -1,5 +1,5 @@ name: Configuration Provider -description: Provides flawless configration for ACME Company © +description: Provides flawless configration for ACME Company ©. Will inject if exists, all @ConfigProperty starting with 'env.' group-id: org.acme artifact-id: configuration-provider metadata: