From c819f579781855d243375f3d32d5df2de67e6b3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 02:05:42 +0000 Subject: [PATCH 1/2] Bump the dependencies group with 15 updates Bumps the dependencies group with 15 updates: | Package | From | To | | --- | --- | --- | | [org.avaje:java11-oss](https://github.com/avaje-pom/java11-oss) | `3.9` | `4.5` | | io.avaje:junit | `1.3` | `1.5` | | [io.avaje:avaje-http-client](https://github.com/avaje/avaje-http-client) | `2.0` | `2.8` | | [io.avaje:avaje-config](https://github.com/avaje/avaje-config) | `3.9` | `4.0` | | [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) | `2.14.0` | `2.18.1` | | [io.avaje:avaje-jsonb](https://github.com/avaje/avaje-jsonb) | `1.4` | `2.3` | | io.avaje:avaje-inject-test | `9.9` | `10.6` | | org.freemarker:freemarker | `2.3.31` | `2.3.33` | | [com.github.spullara.mustache.java:compiler](https://github.com/spullara/mustache.java) | `0.9.10` | `0.9.14` | | org.slf4j:slf4j-api | `1.7.36` | `2.0.16` | | [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) | `1.2.11` | `1.5.12` | | [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) | `3.8.1` | `3.13.0` | | [io.repaint.maven:tiles-maven-plugin](https://github.com/repaint-io/maven-tiles) | `2.22` | `2.40` | | io.avaje:avaje-jsonb-generator | `1.4` | `2.3` | | [org.graalvm.buildtools:native-maven-plugin](https://github.com/graalvm/native-build-tools) | `0.9.16` | `0.10.3` | Updates `org.avaje:java11-oss` from 3.9 to 4.5 - [Release notes](https://github.com/avaje-pom/java11-oss/releases) - [Commits](https://github.com/avaje-pom/java11-oss/commits) Updates `io.avaje:junit` from 1.3 to 1.5 Updates `io.avaje:avaje-http-client` from 2.0 to 2.8 - [Release notes](https://github.com/avaje/avaje-http-client/releases) - [Commits](https://github.com/avaje/avaje-http-client/commits) Updates `io.avaje:avaje-config` from 3.9 to 4.0 - [Release notes](https://github.com/avaje/avaje-config/releases) - [Commits](https://github.com/avaje/avaje-config/compare/3.9...4.0) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.14.0 to 2.18.1 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `io.avaje:avaje-jsonb` from 1.4 to 2.3 - [Release notes](https://github.com/avaje/avaje-jsonb/releases) - [Commits](https://github.com/avaje/avaje-jsonb/compare/1.4...2.3) Updates `io.avaje:avaje-inject-test` from 9.9 to 10.6 Updates `org.freemarker:freemarker` from 2.3.31 to 2.3.33 Updates `com.github.spullara.mustache.java:compiler` from 0.9.10 to 0.9.14 - [Commits](https://github.com/spullara/mustache.java/compare/0.9.10...mustache.java-0.9.14) Updates `org.slf4j:slf4j-api` from 1.7.36 to 2.0.16 Updates `ch.qos.logback:logback-classic` from 1.2.11 to 1.5.12 - [Commits](https://github.com/qos-ch/logback/compare/v_1.2.11...v_1.5.12) Updates `org.apache.maven.plugins:maven-compiler-plugin` from 3.8.1 to 3.13.0 - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.8.1...maven-compiler-plugin-3.13.0) Updates `io.repaint.maven:tiles-maven-plugin` from 2.22 to 2.40 - [Release notes](https://github.com/repaint-io/maven-tiles/releases) - [Changelog](https://github.com/repaint-io/maven-tiles/blob/master/CHANGELOG.adoc) - [Commits](https://github.com/repaint-io/maven-tiles/compare/tiles-maven-plugin-2.22...tiles-maven-plugin-2.40) Updates `io.avaje:avaje-jsonb-generator` from 1.4 to 2.3 Updates `org.graalvm.buildtools:native-maven-plugin` from 0.9.16 to 0.10.3 - [Release notes](https://github.com/graalvm/native-build-tools/releases) - [Commits](https://github.com/graalvm/native-build-tools/compare/0.9.16...0.10.3) --- updated-dependencies: - dependency-name: org.avaje:java11-oss dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: io.avaje:junit dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: io.avaje:avaje-http-client dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: io.avaje:avaje-config dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: io.avaje:avaje-jsonb dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: io.avaje:avaje-inject-test dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: org.freemarker:freemarker dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: com.github.spullara.mustache.java:compiler dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: io.repaint.maven:tiles-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: io.avaje:avaje-jsonb-generator dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: org.graalvm.buildtools:native-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- avaje-jex-freemarker/pom.xml | 2 +- avaje-jex-mustache/pom.xml | 2 +- avaje-jex-test/pom.xml | 6 +++--- avaje-jex/pom.xml | 2 +- examples/example-jdk-jsonb/pom.xml | 10 +++++----- examples/example-jdk/pom.xml | 12 ++++++------ pom.xml | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/avaje-jex-freemarker/pom.xml b/avaje-jex-freemarker/pom.xml index 28e5b00d..2006c846 100644 --- a/avaje-jex-freemarker/pom.xml +++ b/avaje-jex-freemarker/pom.xml @@ -10,7 +10,7 @@ avaje-jex-freemarker - 2.3.31 + 2.3.33 diff --git a/avaje-jex-mustache/pom.xml b/avaje-jex-mustache/pom.xml index ad27a950..07c6dc50 100644 --- a/avaje-jex-mustache/pom.xml +++ b/avaje-jex-mustache/pom.xml @@ -10,7 +10,7 @@ avaje-jex-mustache - 0.9.10 + 0.9.14 diff --git a/avaje-jex-test/pom.xml b/avaje-jex-test/pom.xml index 4afd4d6c..8e7ebf7e 100644 --- a/avaje-jex-test/pom.xml +++ b/avaje-jex-test/pom.xml @@ -21,21 +21,21 @@ io.avaje avaje-http-client - 2.0 + 2.8 io.avaje avaje-inject-test - 9.9 + 10.6 true io.avaje avaje-jsonb - 1.9 + 2.3 true diff --git a/avaje-jex/pom.xml b/avaje-jex/pom.xml index aa5ccc24..5e1a4f64 100644 --- a/avaje-jex/pom.xml +++ b/avaje-jex/pom.xml @@ -23,7 +23,7 @@ io.avaje avaje-config - 3.9 + 4.0 true diff --git a/examples/example-jdk-jsonb/pom.xml b/examples/example-jdk-jsonb/pom.xml index c6167cd2..dc43bde6 100644 --- a/examples/example-jdk-jsonb/pom.xml +++ b/examples/example-jdk-jsonb/pom.xml @@ -6,7 +6,7 @@ org.avaje java11-oss - 3.9 + 4.5 @@ -19,7 +19,7 @@ 17 - 0.9.16 + 0.10.3 @@ -33,7 +33,7 @@ io.avaje avaje-jsonb - 1.4 + 2.3 @@ -43,7 +43,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.13.0 17 @@ -53,7 +53,7 @@ io.avaje avaje-jsonb-generator - 1.4 + 2.3 diff --git a/examples/example-jdk/pom.xml b/examples/example-jdk/pom.xml index dd7789ff..5eb24826 100644 --- a/examples/example-jdk/pom.xml +++ b/examples/example-jdk/pom.xml @@ -6,7 +6,7 @@ org.avaje java11-oss - 3.9 + 4.5 @@ -30,19 +30,19 @@ com.fasterxml.jackson.core jackson-databind - 2.14.0 + 2.18.1 org.slf4j slf4j-api - 1.7.36 + 2.0.16 ch.qos.logback logback-classic - 1.2.11 + 1.5.12 @@ -52,7 +52,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.13.0 ${java.release} @@ -60,7 +60,7 @@ io.repaint.maven tiles-maven-plugin - 2.22 + 2.40 true diff --git a/pom.xml b/pom.xml index 6132bfee..913c9c77 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ true - 2.15.0 + 2.18.1 false 21 2024-10-25T04:21:12Z @@ -38,14 +38,14 @@ io.avaje junit - 1.3 + 1.5 test io.avaje avaje-http-client - 2.0 + 2.8 test From 2ed1f4fbdf0977ceb594bc7b5e3a5e3c00ba3cae Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Fri, 22 Nov 2024 21:21:03 -0500 Subject: [PATCH 2/2] Update JexInjectPlugin.java --- .../io/avaje/jex/test/JexInjectPlugin.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/avaje-jex-test/src/main/java/io/avaje/jex/test/JexInjectPlugin.java b/avaje-jex-test/src/main/java/io/avaje/jex/test/JexInjectPlugin.java index 9bf7e0d4..d12b975b 100644 --- a/avaje-jex-test/src/main/java/io/avaje/jex/test/JexInjectPlugin.java +++ b/avaje-jex-test/src/main/java/io/avaje/jex/test/JexInjectPlugin.java @@ -1,12 +1,13 @@ package io.avaje.jex.test; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; + import io.avaje.http.client.HttpClient; import io.avaje.inject.BeanScope; import io.avaje.inject.test.Plugin; import io.avaje.jex.Jex; -import java.lang.annotation.Annotation; - /** * avaje-inject-test plugin that: * @@ -20,12 +21,13 @@ public final class JexInjectPlugin implements Plugin { private static final String AVAJE_HTTP_CLIENT = "io.avaje.http.api.Client"; private static final String AVAJE_HTTP_PATH = "io.avaje.http.api.Path"; - /** - * Return true if it's a http client this plugin supports. - */ + /** Return true if it's a http client this plugin supports. */ @Override - public boolean forType(Class type) { - return HttpClient.class.equals(type) || isHttpClientApi(type); + public boolean forType(Type type) { + + if (!(type instanceof Class clazz)) return false; + + return HttpClient.class.equals(clazz) || isHttpClientApi(clazz); } private boolean isHttpClientApi(Class type) { @@ -34,10 +36,7 @@ private boolean isHttpClientApi(Class type) { } for (Annotation annotation : type.getAnnotations()) { String name = annotation.annotationType().getName(); - if (AVAJE_HTTP_CLIENT.equals(name)) { - return true; - } - if (AVAJE_HTTP_PATH.equals(name)) { + if (AVAJE_HTTP_CLIENT.equals(name) || AVAJE_HTTP_PATH.equals(name)) { return true; } } @@ -76,11 +75,12 @@ private static class LocalScope implements Plugin.Scope { } @Override - public Object create(Class type) { + public Object create(Type type) { + if (HttpClient.class.equals(type)) { return httpClient; } - return apiClient(type); + return apiClient((Class) type); } private Object apiClient(Class clientInterface) {