Merge pull request #827 from ggalmazor/issue_826_fix_wrong_language_l…

…evel_api_calls Replace Java 11 API calls with Java 8 alternative calls
getodk · Oct 23, 2019 · a2941e0 · a2941e0
2 parents 584f792 + 4c01b97
commit a2941e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/org/opendatakit/briefcase/pull/aggregate/OpaqueCursor.java b/src/org/opendatakit/briefcase/pull/aggregate/OpaqueCursor.java
@@ -23,7 +23,7 @@ public String getValue() {
 
   @Override
   public boolean isEmpty() {
-    return Optional.ofNullable(value).isEmpty();
+    return !Optional.ofNullable(value).isPresent();
   }
 
   @Override

diff --git a/test/java/org/opendatakit/briefcase/model/form/FormMetadataCommandsTest.java b/test/java/org/opendatakit/briefcase/model/form/FormMetadataCommandsTest.java
@@ -21,6 +21,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.opendatakit.briefcase.pull.aggregate.Cursor;
+import org.opendatakit.briefcase.reused.BriefcaseException;
 
 public class FormMetadataCommandsTest {
 
@@ -79,7 +80,7 @@ public void updates_all_metadata_removing_cursors() {
         .stream()
         .map(FormMetadata::getKey)
         .forEach(key -> {
-          FormMetadata actualFormMetadata = formMetadataPort.fetch(key).orElseThrow();
+          FormMetadata actualFormMetadata = formMetadataPort.fetch(key).orElseThrow(BriefcaseException::new);
           assertThat(actualFormMetadata.getCursor().isEmpty(), is(true));
         });
   }