Merge pull request #158 from SentryMan/resources

Add JDK 22 support/fix custom bundle loading

Author: SentryMan

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>

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());

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);
   }
 

validator/pom.xml

@@ -18,7 +18,13 @@
       <artifactId>avaje-lang</artifactId>
       <version>1.0</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>

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 */

validator/src/main/java/io/avaje/validation/core/ResourceBundleManager.java

@@ -2,17 +2,21 @@
 
 import static java.util.ResourceBundle.getBundle;
 
+import java.lang.System.Logger.Level;
 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";
@@ -37,7 +41,13 @@ final class ResourceBundleManager {
   }
 
   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(Level.ERROR, "failed to load " + name + " with locale " + locale);
+    }
   }
 
   @Nullable

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;