Merge pull request #107 from HubSpot/retarget_code

Pin the release target to jdk8

RosettaCore/src/main/java/com/hubspot/rosetta/internal/RosettaAnnotationIntrospector.java

@@ -24,6 +24,7 @@
 import com.hubspot.rosetta.annotations.RosettaValue;
 import com.hubspot.rosetta.annotations.StoredAsJson;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 public class RosettaAnnotationIntrospector extends NopAnnotationIntrospector {
 
@@ -121,17 +122,21 @@ public boolean hasCreatorAnnotation(Annotated a) {
 
   @Override
   public PropertyName findNameForSerialization(Annotated a) {
-    return findRosettaGetterName(a)
-      .or(() -> findRosettaPropertyName(a))
-      .or(() -> Optional.ofNullable(super.findNameForSerialization(a)))
+    return getFirstNonEmpty(
+        () -> findRosettaGetterName(a),
+        () -> findRosettaPropertyName(a),
+        () -> Optional.ofNullable(super.findNameForSerialization(a))
+      )
       .orElse(null);
   }
 
   @Override
   public PropertyName findNameForDeserialization(Annotated a) {
-    return findRosettaSetterName(a)
-      .or(() -> findRosettaPropertyName(a))
-      .or(() -> Optional.ofNullable(super.findNameForDeserialization(a)))
+    return getFirstNonEmpty(
+        () -> findRosettaSetterName(a),
+        () -> findRosettaPropertyName(a),
+        () -> Optional.ofNullable(super.findNameForDeserialization(a))
+      )
       .orElse(null);
   }
 
@@ -211,4 +216,14 @@ private Annotated getAnnotatedTypeFromAnnotatedMethod(AnnotatedMethod a) {
       );
     }
   }
+
+  private <T> Optional<T> getFirstNonEmpty(Supplier<Optional<T>>... suppliers) {
+    for (Supplier<Optional<T>> supplier : suppliers) {
+      Optional<T> maybeValue = supplier.get();
+      if (maybeValue.isPresent()) {
+        return maybeValue;
+      }
+    }
+    return Optional.empty();
+  }
 }

RosettaJdbi3/src/test/java/com/hubspot/rosetta/jdbi3/RosettaRowMapperFactoryTest.java

@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import org.junit.Test;
@@ -24,6 +25,6 @@ public void itMapsObject() {
     assertThat(actual).isEqualTo(expected);
 
     Map<Integer, TestObject> map = getDao().getAllMap();
-    assertThat(map).containsOnly(Map.entry(1, expected));
+    assertThat(map).containsAllEntriesOf(Collections.singletonMap(1, expected));
   }
 }

pom.xml

@@ -25,6 +25,11 @@
         <module>RosettaImmutables</module>
     </modules>
 
+   <properties>
+        <project.build.releaseJdk>8</project.build.releaseJdk>
+        <project.build.targetJdk>8</project.build.targetJdk>
+   </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>