use orElse instead of get to handle !isPresent() for Optionals

Author: PhilippSalvisberg

sqldev/src/test/java/org/utplsql/sqldev/test/coverage/CodeCoverageReporterTest.java

@@ -93,7 +93,7 @@ private Path getNewestOutputFile() {
                 final String msg = "Cannot get newest output file in " + dir.getAbsolutePath() + ".";
                 throw new GenericRuntimeException(msg, e);
             }
-            return last.get();
+            return last.orElse(null);
     }
 
     @Test

sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalBugFixTest.java

@@ -45,7 +45,8 @@ public void issue54FolderIconForSuitesWithoutTests() {
         final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));
         final List<Node> actualNodes = dao.runnables();
         final Node pkg = actualNodes.stream().filter(it -> it.getId().equals("SCOTT:junit_utplsql_test_pkg"))
-                .findFirst().get();
+                .findFirst().orElse(null);
+        Assert.assertNotNull(pkg);
         Assert.assertEquals("FOLDER_ICON", pkg.getIconName());
     }
 
@@ -64,7 +65,8 @@ public void issue54PackageIconForSuitesWithTests() {
         final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));
         final List<Node> actualNodes = dao.runnables();
         final Node pkg = actualNodes.stream().filter(it -> it.getId().equals("SCOTT:junit_utplsql_test_pkg"))
-                .findFirst().get();
+                .findFirst().orElse(null);
+        Assert.assertNotNull(pkg);
         Assert.assertEquals("PACKAGE_ICON", pkg.getIconName());
     }
 

sqldev/src/test/java/org/utplsql/sqldev/test/parser/SqlDevParserTest.java

@@ -103,10 +103,12 @@ public void packageSpecMembers() {
         final SqlDevParser parser = new SqlDevParser();
         final Set<Member> actual = parser.getMembers(getPackageSpec());
         Assert.assertEquals(6, actual.size());
-        final Member first = actual.stream().findFirst().get();
+        final Member first = actual.stream().findFirst().orElse(null);
+        Assert.assertNotNull(first);
         Assert.assertEquals("PROCEDURE", first.type);
         Assert.assertEquals("test_1_ok", first.name);
-        final Member last =  actual.stream().reduce((m1, m2) -> m2).get();
+        final Member last =  actual.stream().reduce((m1, m2) -> m2).orElse(null);
+        Assert.assertNotNull(last);
         Assert.assertEquals("FUNCTION", last.type);
         Assert.assertEquals("my_Func", last.name);
     }
@@ -116,10 +118,12 @@ public void packageBodyMembers() {
         final SqlDevParser parser = new SqlDevParser();
         final Set<Member> actual = parser.getMembers(getPackageBody());
         Assert.assertEquals(6, actual.size());
-        final Member first = actual.stream().findFirst().get();
+        final Member first = actual.stream().findFirst().orElse(null);
+        Assert.assertNotNull(first);
         Assert.assertEquals("PROCEDURE", first.type);
         Assert.assertEquals("test_1_ok", first.name);
-        final Member last =  actual.stream().reduce((m1, m2) -> m2).get();
+        final Member last =  actual.stream().reduce((m1, m2) -> m2).orElse(null);
+        Assert.assertNotNull(last);
         Assert.assertEquals("FUNCTION", last.type);
         Assert.assertEquals("my_Func", last.name);
     }