Java 14 Record is not supported fix #826

- Remove static array with default resolvers. Now it is a list
- Added ValueResolver.defaultResolvers. It adds MethodValueResolver on Java14+

Author: jknack

handlebars-springmvc/src/main/java/com/github/jknack/handlebars/springmvc/HandlebarsViewResolver.java

@@ -17,6 +17,7 @@
  */
 package com.github.jknack.handlebars.springmvc;
 
+import static com.github.jknack.handlebars.ValueResolver.defaultValueResolvers;
 import static java.util.Objects.requireNonNull;
 
 import java.io.File;
@@ -34,6 +35,8 @@
 import java.util.Map.Entry;
 import java.util.ResourceBundle;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
@@ -79,7 +82,7 @@ public class HandlebarsViewResolver extends AbstractTemplateViewResolver
   /**
    * The value's resolvers.
    */
-  private ValueResolver[] valueResolvers = ValueResolver.VALUE_RESOLVERS;
+  private List<ValueResolver> valueResolvers = new ArrayList<>(defaultValueResolvers());
 
   /**
    * Fail on missing file. Default is: true.
@@ -197,7 +200,7 @@ protected AbstractUrlBasedView configure(final HandlebarsView view)
     // Compile the template.
     try {
       view.setTemplate(handlebars.compile(url));
-      view.setValueResolver(valueResolvers);
+      view.setValueResolver(valueResolvers.toArray(new ValueResolver[0]));
     } catch (IOException ex) {
       if (failOnMissingFile) {
         throw ex;
@@ -331,7 +334,7 @@ public Handlebars getHandlebars() {
   /**
    * @return The array of resolvers.
    */
-  protected ValueResolver[] getValueResolvers() {
+  protected List<ValueResolver> getValueResolvers() {
     return this.valueResolvers;
   }
 
@@ -341,8 +344,10 @@ protected ValueResolver[] getValueResolvers() {
    * @param valueResolvers The value resolvers. Required.
    */
   public void setValueResolvers(final ValueResolver... valueResolvers) {
-    this.valueResolvers = requireNonNull(valueResolvers,
+    requireNonNull(valueResolvers,
         "At least one value-resolver must be present.");
+    this.valueResolvers = Stream.of(valueResolvers)
+        .collect(Collectors.toList());
   }
 
   /**

handlebars/src/main/java/com/github/jknack/handlebars/Context.java

@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.github.jknack.handlebars.context.MapValueResolver;
@@ -181,22 +182,22 @@ private static class CompositeValueResolver implements ValueResolver {
     /**
      * The internal value resolvers.
      */
-    private ValueResolver[] resolvers;
+    private List<ValueResolver> resolvers;
 
     /**
      * Creates a new {@link CompositeValueResolver}.
      *
      * @param resolvers The value resolvers.
      */
-    CompositeValueResolver(final ValueResolver... resolvers) {
+    CompositeValueResolver(final List<ValueResolver> resolvers) {
       this.resolvers = resolvers;
     }
 
     @Override
     public Object resolve(final Object context, final String name) {
       int i = 0;
-      while (i < resolvers.length) {
-        Object value = resolvers[i].resolve(context, name);
+      while (i < resolvers.size()) {
+        Object value = resolvers.get(i).resolve(context, name);
         if (value != UNRESOLVED) {
           return value == null ? NULL : value;
         }
@@ -208,8 +209,8 @@ public Object resolve(final Object context, final String name) {
     @Override
     public Object resolve(final Object context) {
       int i = 0;
-      while (i < resolvers.length) {
-        Object value = resolvers[i].resolve(context);
+      while (i < resolvers.size()) {
+        Object value = resolvers.get(i).resolve(context);
         if (value != UNRESOLVED) {
           return value == null ? NULL : value;
         }
@@ -258,7 +259,7 @@ private Builder(final Context parent, final Object model) {
      */
     private Builder(final Object model) {
       context = Context.root(model);
-      context.setResolver(new CompositeValueResolver(ValueResolver.VALUE_RESOLVERS));
+      context.setResolver(new CompositeValueResolver(ValueResolver.defaultValueResolvers()));
     }
 
     /**
@@ -294,30 +295,29 @@ public Builder resolver(final ValueResolver... resolvers) {
       notEmpty(resolvers, "At least one value-resolver must be present.");
       boolean mapResolver = Stream.of(resolvers).anyMatch(MapValueResolver.class::isInstance);
       if (!mapResolver) {
-        ValueResolver[] safeResolvers = new ValueResolver[resolvers.length + 1];
-        System.arraycopy(resolvers, 0, safeResolvers, 0, resolvers.length);
-        safeResolvers[safeResolvers.length - 1] = MapValueResolver.INSTANCE;
-        context.setResolver(new CompositeValueResolver(safeResolvers));
+        context.setResolver(new CompositeValueResolver(
+            Stream.concat(Stream.of(resolvers), Stream.of(MapValueResolver.INSTANCE))
+                .collect(Collectors.toList())
+        ));
       } else {
-        context.setResolver(new CompositeValueResolver(resolvers));
+        context.setResolver(new CompositeValueResolver(Arrays.asList(resolvers)));
       }
       return this;
     }
 
     /**
      * Add one or more value resolver to the defaults defined by
-     * {@link ValueResolver#VALUE_RESOLVERS}.
+     * {@link ValueResolver#defaultValueResolvers()}.
      *
      * @param resolvers The value resolvers. Required.
      * @return This builder.
      */
     public Builder push(final ValueResolver... resolvers) {
       notEmpty(resolvers, "At least one value-resolver must be present.");
       List<ValueResolver> merged = new ArrayList<>();
-      merged.addAll(Arrays.asList(ValueResolver.VALUE_RESOLVERS));
-      merged.addAll(Arrays.asList(resolvers));
-      context.setResolver(
-          new CompositeValueResolver(merged.toArray(new ValueResolver[merged.size()])));
+      merged.addAll(ValueResolver.defaultValueResolvers());
+      Stream.of(resolvers).forEach(merged::add);
+      context.setResolver(new CompositeValueResolver(merged));
       return this;
     }
 

handlebars/src/main/java/com/github/jknack/handlebars/Handlebars.java

@@ -176,9 +176,15 @@ public boolean equals(final Object obj) {
    */
   public static class Utils {
 
+    /** Java 14. */
+    private static final int JAVA_14 = 14;
+
     /** Current Java version: 8, 11, 15, etc. */
     public static final int javaVersion = javaVersion();
 
+    /** True when running on Java 14 or higher. */
+    public static final boolean javaVersion14 = javaVersion() >= JAVA_14;
+
     /** Prefix for Java version: 1.8 (mostly). */
     private static final String VERSION_PREFIX = "1.";
 

handlebars/src/main/java/com/github/jknack/handlebars/ValueResolver.java

@@ -17,11 +17,16 @@
  */
 package com.github.jknack.handlebars;
 
+import static java.util.Arrays.asList;
+import static java.util.Collections.unmodifiableList;
+
+import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
 
 import com.github.jknack.handlebars.context.JavaBeanValueResolver;
 import com.github.jknack.handlebars.context.MapValueResolver;
+import com.github.jknack.handlebars.context.MethodValueResolver;
 
 /**
  * A hook interface for resolving values from the {@link Context context stack}.
@@ -31,12 +36,6 @@
  */
 public interface ValueResolver {
 
-  /**
-   * The default value resolvers.
-   */
-  ValueResolver[] VALUE_RESOLVERS = {MapValueResolver.INSTANCE,
-      JavaBeanValueResolver.INSTANCE };
-
   /**
    * A mark object.
    */
@@ -67,12 +66,28 @@ public interface ValueResolver {
    */
   Object resolve(Object context);
 
-
   /**
    * List all the properties and their values for the given object.
    *
    * @param context The context object. Not null.
    * @return All the properties and their values for the given object.
    */
   Set<Entry<String, Object>> propertySet(Object context);
+
+  /**
+   * Default value resolvers. Including:
+   *
+   * - {@link MapValueResolver}
+   * - {@link JavaBeanValueResolver}
+   * - {@link MethodValueResolver}. On Java 14 or higher.
+   *
+   * @return Immutable list of value resolvers.
+   */
+  static List<ValueResolver> defaultValueResolvers() {
+    if (Handlebars.Utils.javaVersion14) {
+      return unmodifiableList(asList(MapValueResolver.INSTANCE,
+          JavaBeanValueResolver.INSTANCE, MethodValueResolver.INSTANCE));
+    }
+    return unmodifiableList(asList(MapValueResolver.INSTANCE, JavaBeanValueResolver.INSTANCE));
+  }
 }

handlebars/src/main/java/com/github/jknack/handlebars/internal/BaseTemplate.java

@@ -57,9 +57,6 @@
  */
 abstract class BaseTemplate implements Template {
 
-  /** Java 15. */
-  private static final int JAVA_15 = 15;
-
   /**
    * The handlebars object. Required.
    */
@@ -268,7 +265,7 @@ private boolean isDefault(final Method method) {
 
           private Object invokeDefaultMethod(final Method method, final Class<?> lookupClass,
               final Object proxy, final Object... args) throws Throwable {
-            if (Handlebars.Utils.javaVersion >= JAVA_15) {
+            if (Handlebars.Utils.javaVersion14) {
               MethodType methodType = MethodType.methodType(method.getReturnType(),
                   method.getParameterTypes());
               return MethodHandles.lookup()

handlebars/src/test/java/com/github/jknack/handlebars/EachKeyTest.java

@@ -26,6 +26,9 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
+import com.github.jknack.handlebars.context.JavaBeanValueResolver;
+import com.github.jknack.handlebars.context.MapValueResolver;
+
 public class EachKeyTest extends AbstractTest {
 
   public static class Blog {
@@ -48,6 +51,12 @@ public String getBody() {
     }
   }
 
+  @Override protected Object configureContext(Object context) {
+    return Context.newBuilder(context)
+        .resolver(MapValueResolver.INSTANCE, JavaBeanValueResolver.INSTANCE)
+        .build();
+  }
+
   @Ignore
   public void eachKeyWithString() throws IOException {
     String result = compile("{{#each this}}{{@key}} {{/each}}").apply("String");
@@ -65,7 +74,7 @@ public void eachKeyWithInt() throws IOException {
   @Test
   public void eachKeyWithJavaBean() throws IOException {
     Blog blog = new Blog("Handlebars.java", "...");
-    String result = compile("{{#each this}}{{@key}}: {{this}} {{/each}}").apply(blog);
+    String result = compile("{{#each this}}{{@key}}: {{this}} {{/each}}").apply(configureContext(blog));
 
     String expected1 = "body: ... title: Handlebars.java ";
     String expected2 = "title: Handlebars.java body: ... ";

handlebars/src/test/java/handlebarsjs/spec/BlockHelperMissingTest.java

@@ -15,9 +15,16 @@
 import com.github.jknack.handlebars.HelperRegistry;
 import com.github.jknack.handlebars.Options;
 import com.github.jknack.handlebars.Template;
+import com.github.jknack.handlebars.context.JavaBeanValueResolver;
 
 public class BlockHelperMissingTest extends AbstractTest {
 
+  @Override protected Object configureContext(Object context) {
+    return Context.newBuilder(context)
+        .resolver(JavaBeanValueResolver.INSTANCE)
+        .build();
+  }
+
   @Test
   public void ifContextIsNotFoundHelperMissingIsUsed() throws IOException {
     String string = "{{hello}} {{link_to world}}";