BAEL-3840 Adjust examples based on editor feedback

amdegregorio · amdegregorio · commit 48b156bcd365 · 2020-02-28T06:54:27.000-05:00
diff --git a/core-java-modules/core-java-exceptions-2/src/main/java/com/baeldung/suppressed/ExceptionalResource.java b/core-java-modules/core-java-exceptions-2/src/main/java/com/baeldung/suppressed/ExceptionalResource.java
@@ -3,7 +3,7 @@
 public class ExceptionalResource implements AutoCloseable {
     
     public void processSomething() {
-        throw new NullPointerException("Thrown from processSomething()");
+        throw new IllegalArgumentException("Thrown from processSomething()");
     }
 
     @Override
diff --git a/core-java-modules/core-java-exceptions-2/src/main/java/com/baeldung/suppressed/SuppressedExceptionsDemo.java b/core-java-modules/core-java-exceptions-2/src/main/java/com/baeldung/suppressed/SuppressedExceptionsDemo.java
@@ -1,6 +1,7 @@
 package com.baeldung.suppressed;
 
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 
 public class SuppressedExceptionsDemo {
@@ -9,8 +10,8 @@ public static void demoSuppressedException(String filePath) throws IOException {
         FileInputStream fileIn = null;
         try {
             fileIn = new FileInputStream(filePath);
-        } catch (IOException e) {
-            throw new IOException(e.getMessage());
+        } catch (FileNotFoundException e) {
+            throw new IOException(e);
         } finally {
             fileIn.close();
         }
@@ -30,6 +31,7 @@ public static void demoAddSuppressedException(String filePath) throws IOExceptio
                 if (firstException != null) {
                     npe.addSuppressed(firstException);
                 }
+                throw npe;
             }
         }
     }
diff --git a/core-java-modules/core-java-exceptions-2/src/test/java/com/baeldung/suppressed/SuppressedExceptionsUnitTest.java b/core-java-modules/core-java-exceptions-2/src/test/java/com/baeldung/suppressed/SuppressedExceptionsUnitTest.java
@@ -21,6 +21,7 @@ public void givenNonExistentFileName_whenAttemptFileOpenStoreSuppressed_thenSupp
         try {
             SuppressedExceptionsDemo.demoAddSuppressedException("/non-existent-path/non-existent-file.txt");
         } catch (Exception e) {
+            assertThat(e, instanceOf(NullPointerException.class));
             assertEquals(1, e.getSuppressed().length);
             assertThat(e.getSuppressed()[0], instanceOf(FileNotFoundException.class));
         }
@@ -31,8 +32,10 @@ public void whenUsingExceptionalResource_thenSuppressedExceptionAvailable() {
         try {
             SuppressedExceptionsDemo.demoExceptionalResource();
         } catch (Exception e) {
+            assertThat(e, instanceOf(IllegalArgumentException.class));
             assertEquals("Thrown from processSomething()", e.getMessage());
             assertEquals(1, e.getSuppressed().length);
+            assertThat(e.getSuppressed()[0], instanceOf(NullPointerException.class));
             assertEquals("Thrown from close()", e.getSuppressed()[0].getMessage());
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`public class ExceptionalResource implements AutoCloseable {`
`4`	`4`
`5`	`5`	`public void processSomething() {`
`6`		`- throw new NullPointerException("Thrown from processSomething()");`
	`6`	`+ throw new IllegalArgumentException("Thrown from processSomething()");`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.baeldung.suppressed;`
`2`	`2`
`3`	`3`	`import java.io.FileInputStream;`
	`4`	`+import java.io.FileNotFoundException;`
`4`	`5`	`import java.io.IOException;`
`5`	`6`
`6`	`7`	`public class SuppressedExceptionsDemo {`
`@@ -9,8 +10,8 @@ public static void demoSuppressedException(String filePath) throws IOException {`
`9`	`10`	`FileInputStream fileIn = null;`
`10`	`11`	`try {`
`11`	`12`	`fileIn = new FileInputStream(filePath);`
`12`		`- } catch (IOException e) {`
`13`		`- throw new IOException(e.getMessage());`
	`13`	`+ } catch (FileNotFoundException e) {`
	`14`	`+ throw new IOException(e);`
`14`	`15`	`} finally {`
`15`	`16`	`fileIn.close();`
`16`	`17`	`}`
`@@ -30,6 +31,7 @@ public static void demoAddSuppressedException(String filePath) throws IOExceptio`
`30`	`31`	`if (firstException != null) {`
`31`	`32`	`npe.addSuppressed(firstException);`
`32`	`33`	`}`
	`34`	`+ throw npe;`
`33`	`35`	`}`
`34`	`36`	`}`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public void givenNonExistentFileName_whenAttemptFileOpenStoreSuppressed_thenSupp`
`21`	`21`	`try {`
`22`	`22`	`SuppressedExceptionsDemo.demoAddSuppressedException("/non-existent-path/non-existent-file.txt");`
`23`	`23`	`} catch (Exception e) {`
	`24`	`+ assertThat(e, instanceOf(NullPointerException.class));`
`24`	`25`	`assertEquals(1, e.getSuppressed().length);`
`25`	`26`	`assertThat(e.getSuppressed()[0], instanceOf(FileNotFoundException.class));`
`26`	`27`	`}`
`@@ -31,8 +32,10 @@ public void whenUsingExceptionalResource_thenSuppressedExceptionAvailable() {`
`31`	`32`	`try {`
`32`	`33`	`SuppressedExceptionsDemo.demoExceptionalResource();`
`33`	`34`	`} catch (Exception e) {`
	`35`	`+ assertThat(e, instanceOf(IllegalArgumentException.class));`
`34`	`36`	`assertEquals("Thrown from processSomething()", e.getMessage());`
`35`	`37`	`assertEquals(1, e.getSuppressed().length);`
	`38`	`+ assertThat(e.getSuppressed()[0], instanceOf(NullPointerException.class));`
`36`	`39`	`assertEquals("Thrown from close()", e.getSuppressed()[0].getMessage());`
`37`	`40`	`}`
`38`	`41`	`}`