Merge branch 'main' into feature/add-native-image

rbygrave · web-flow · commit c39f2232315d · 2023-10-24T21:18:44.000+13:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: "daily"
+  open-pull-requests-limit: 10
diff --git a/.github/workflows/dependabot-merge.yml b/.github/workflows/dependabot-merge.yml
@@ -0,0 +1,28 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Approve a PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      # Enable for automerge
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/jdk-ea.yml b/.github/workflows/jdk-ea.yml
@@ -0,0 +1,39 @@
+
+name: JDK EA
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '48 0 * * 6'
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      fail-fast: false
+      matrix:
+        java_version: [GA,EA]
+        os: [ubuntu-latest]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Java
+      uses: oracle-actions/setup-java@v1
+      with:
+        website: jdk.java.net
+        release: ${{ matrix.java_version }}
+    - name: Maven cache
+      uses: actions/cache@v3
+      env:
+        cache-name: maven-cache
+      with:
+        path:
+          ~/.m2
+        key: build-${{ env.cache-name }}
+    - name: Build with Maven
+      run: mvn clean test
+
diff --git a/blackbox-test/pom.xml b/blackbox-test/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
-      <version>8.0.0.Final</version>
+      <version>8.0.1.Final</version>
     </dependency>
 
     <dependency>
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>2.0-RC2</version>
+      <version>2.0-RC12</version>
     </dependency>
 
     <!-- test dependencies -->
diff --git a/blackbox-test/src/main/java/module-info.java b/blackbox-test/src/main/java/module-info.java
@@ -5,4 +5,5 @@
   requires jakarta.validation;
   requires jakarta.inject;
   provides io.avaje.validation.Validator.GeneratedComponent with example.avaje.valid.GeneratedValidatorComponent;
+  provides io.avaje.inject.spi.Module with example.avaje.AvajeModule;
 }
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java11-oss</artifactId>
-    <version>3.10</version>
+    <version>3.12</version>
   </parent>
 
   <groupId>io.avaje</groupId>
@@ -27,7 +27,7 @@
     <nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
     <java.version>17</java.version>
     <java.release>17</java.release>
-    <inject.version>9.4-RC3</inject.version>
+    <inject.version>9.8</inject.version>
     <http.version>2.0-RC2</http.version>
   </properties>
 
diff --git a/validator-generator/pom.xml b/validator-generator/pom.xml
@@ -57,14 +57,14 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>2.0-RC5</version>
+      <version>2.0-RC12</version>
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>9.5</version>
+      <version>9.8</version>
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
diff --git a/validator-generator/src/main/java/io/avaje/validation/generator/ValidationProcessor.java b/validator-generator/src/main/java/io/avaje/validation/generator/ValidationProcessor.java
@@ -90,9 +90,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     getElements(round, ValidMethodPrism.PRISM_TYPE)
         .map(ElementFilter::methodsIn)
         .ifPresent(this::writeParamProviderForMethod);
-
-    writeAdaptersForImported(
-        round.getElementsAnnotatedWith(typeElement(ImportValidPojoPrism.PRISM_TYPE)));
+    getElements(round, ImportValidPojoPrism.PRISM_TYPE).ifPresent(this::writeAdaptersForImported);
     initialiseComponent();
     cascadeTypes();
     writeComponent(round.processingOver());
diff --git a/validator-http-plugin/pom.xml b/validator-http-plugin/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>2.0-RC2</version>
+      <version>2.0-RC12</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
diff --git a/validator-http-plugin/src/main/java/io/avaje/validation/http/BeanValidator.java b/validator-http-plugin/src/main/java/io/avaje/validation/http/BeanValidator.java
@@ -29,7 +29,7 @@ public void validate(Object bean, String acceptLanguage, Class<?>... groups) thr
   }
 
   @PostConstruct
-  void setValidator(BeanScope scope) {
+  public void setValidator(BeanScope scope) {
     this.validator = scope.get(Validator.class);
   }
 
diff --git a/validator/pom.xml b/validator/pom.xml
@@ -16,9 +16,15 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-lang</artifactId>
+      <version>1.1</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-applog</artifactId>
       <version>1.0</version>
     </dependency>
-
+    
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-validator-http-plugin</artifactId>
diff --git a/validator/src/main/java/io/avaje/validation/Validator.java b/validator/src/main/java/io/avaje/validation/Validator.java
@@ -113,7 +113,10 @@ interface Builder {
     /** Add a AnnotationValidationAdapter to use for the given type. */
     <T> Builder add(Class<? extends Annotation> type, ValidationAdapter<T> adapter);
 
-    /** Lookup ResourceBundles with the given names for error message interpolation */
+    /**
+     * Lookup ResourceBundles with the given names for error message interpolation. This will
+     * attempt to load the bundles for every locale configured with this builder
+     */
     Builder addResourceBundles(String... bundleName);
 
     /** Add ResourceBundles for error message interpolation */
diff --git a/validator/src/main/java/io/avaje/validation/core/ResourceBundleManager.java b/validator/src/main/java/io/avaje/validation/core/ResourceBundleManager.java
@@ -1,18 +1,21 @@
 package io.avaje.validation.core;
 
+import static java.lang.System.Logger.Level.ERROR;
 import static java.util.ResourceBundle.getBundle;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
+import io.avaje.applog.AppLog;
 import io.avaje.lang.Nullable;
 
 final class ResourceBundleManager {
-
+  private static final System.Logger logger = AppLog.getLogger(ResourceBundleManager.class);
   private final Map<Locale, List<ResourceBundle>> map = new HashMap<>();
   private static final List<ResourceBundle> EMPTY = List.of();
   private static final String DEFAULT_BUNDLE = "io.avaje.validation.Messages";
@@ -30,14 +33,17 @@ final class ResourceBundleManager {
     }
     // since default is added last, it will be the last place messages will be resolved
     addBundle(DEFAULT_BUNDLE, localeResolver.defaultLocale());
-
     for (final Locale locale : localeResolver.otherLocales()) {
       addBundle(DEFAULT_BUNDLE, locale);
     }
   }
 
   private void addBundle(final String name, final Locale locale) {
-    map.computeIfAbsent(locale, key -> new ArrayList<>()).add(getBundle(name, locale));
+    try {
+      map.computeIfAbsent(locale, key -> new ArrayList<>()).add(getBundle(name, locale));
+    } catch (MissingResourceException e) {
+      logger.log(ERROR, "failed to load " + name + " with locale " + locale);
+    }
   }
 
   @Nullable
diff --git a/validator/src/main/java/module-info.java b/validator/src/main/java/module-info.java
@@ -4,6 +4,7 @@
   exports io.avaje.validation.spi;
 
   requires io.avaje.lang;
+  requires io.avaje.applog;
   requires static io.avaje.inject;
 
   uses io.avaje.validation.Validator.GeneratedComponent;

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,5 @@`
`5`	`5`	`requires jakarta.validation;`
`6`	`6`	`requires jakarta.inject;`
`7`	`7`	`provides io.avaje.validation.Validator.GeneratedComponent with example.avaje.valid.GeneratedValidatorComponent;`
	`8`	`+ provides io.avaje.inject.spi.Module with example.avaje.AvajeModule;`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void validate(Object bean, String acceptLanguage, Class<?>... groups) thr`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@PostConstruct`
`32`		`- void setValidator(BeanScope scope) {`
	`32`	`+ public void setValidator(BeanScope scope) {`
`33`	`33`	`this.validator = scope.get(Validator.class);`
`34`	`34`	`}`
`35`	`35`