Minor adjustment

- or() requires Java 9
- License years

Author: harawata

src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

@@ -710,21 +710,22 @@ private Optional<Constructor<?>> findConstructorForAutomapping(final Class<?> re
     if (constructors.length == 1) {
       return Optional.of(constructors[0]);
     }
-    return Arrays.stream(constructors)
-      .filter(x -> x.isAnnotationPresent(AutomapConstructor.class))
-      .reduce((x, y) -> {
-        throw new ExecutorException("@AutomapConstructor should be used in only one constructor.");
-      }).or(() -> {
-        if (configuration.isArgNameBasedConstructorAutoMapping()) {
-          // Finding-best-match type implementation is possible,
-          // but using @AutomapConstructor seems sufficient.
-          throw new ExecutorException(MessageFormat.format(
-            "'argNameBasedConstructorAutoMapping' is enabled and the class ''{0}'' has multiple constructors, so @AutomapConstructor must be added to one of the constructors.",
-            resultType.getName()));
-        } else {
-          return Arrays.stream(constructors).filter(x -> findUsableConstructorByArgTypes(x, rsw.getJdbcTypes())).findAny();
-        }
-      });
+    Optional<Constructor<?>> reduce = Arrays.stream(constructors)
+        .filter(x -> x.isAnnotationPresent(AutomapConstructor.class))
+        .reduce((x, y) -> {
+          throw new ExecutorException("@AutomapConstructor should be used in only one constructor.");
+        });
+    if (reduce.isPresent()) {
+      return reduce;
+    } else if (configuration.isArgNameBasedConstructorAutoMapping()) {
+      // Finding-best-match type implementation is possible,
+      // but using @AutomapConstructor seems sufficient.
+      throw new ExecutorException(MessageFormat.format(
+          "'argNameBasedConstructorAutoMapping' is enabled and the class ''{0}'' has multiple constructors, so @AutomapConstructor must be added to one of the constructors.",
+          resultType.getName()));
+    } else {
+      return Arrays.stream(constructors).filter(x -> findUsableConstructorByArgTypes(x, rsw.getJdbcTypes())).findAny();
+    }
   }
 
   private boolean findUsableConstructorByArgTypes(final Constructor<?> constructor, final List<JdbcType> jdbcTypes) {

src/test/java/org/apache/ibatis/autoconstructor/AutoConstructorMapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2021 the original author or authors.
+ *    Copyright 2009-2022 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

src/test/java/org/apache/ibatis/autoconstructor/AutoConstructorTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2021 the original author or authors.
+ *    Copyright 2009-2022 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.