fix sonar complaints; #20

bbilger · Jun 21, 2017 · ffda9da · ffda9da
1 parent e146708
commit ffda9da
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/...tainer/src/main/java/com/jrestless/core/interceptor/ConditionalBase64ReadInterceptor.java b/...tainer/src/main/java/com/jrestless/core/interceptor/ConditionalBase64ReadInterceptor.java
@@ -18,7 +18,6 @@
 import java.io.IOException;
 import java.util.Base64;
 
-import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.ext.ReaderInterceptor;
 import javax.ws.rs.ext.ReaderInterceptorContext;
 
@@ -33,7 +32,7 @@
 public abstract class ConditionalBase64ReadInterceptor implements ReaderInterceptor {
 
 	@Override
-	public final Object aroundReadFrom(ReaderInterceptorContext context) throws IOException, WebApplicationException {
+	public final Object aroundReadFrom(ReaderInterceptorContext context) throws IOException {
 		if (isBase64(context)) {
 			context.setInputStream(Base64.getDecoder().wrap(context.getInputStream()));
 		}

diff --git a/test/jrestless-test/src/main/java/com/jrestless/test/DynamicJerseyTestRunner.java b/test/jrestless-test/src/main/java/com/jrestless/test/DynamicJerseyTestRunner.java
@@ -41,18 +41,10 @@ public class DynamicJerseyTestRunner {
 	 */
 	public void runJerseyTest(JerseyTest jerseyTest, ThrowingConsumer<JerseyTest> test) throws Exception {
 		try {
-			try {
-				jerseyTest.setUp();
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
+			jerseyTest.setUp();
 			test.accept(jerseyTest);
 		} finally {
-			try {
-				jerseyTest.tearDown();
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
+			jerseyTest.tearDown();
 		}
 	}
 

diff --git a/test/jrestless-test/src/main/java/com/jrestless/test/IOUtils.java b/test/jrestless-test/src/main/java/com/jrestless/test/IOUtils.java
@@ -54,7 +54,7 @@ public static byte[] toBytes(InputStream is) {
 			buffer.flush();
 			return buffer.toByteArray();
 		} catch (IOException ioe) {
-			throw new RuntimeException(ioe);
+			throw new IORuntimeException(ioe);
 		}
 	}
 
@@ -85,4 +85,11 @@ public static String toString(InputStream is, Charset charset) {
 		return new String(toBytes(is), charset);
 	}
 
+	public static final class IORuntimeException extends RuntimeException {
+		private static final long serialVersionUID = 1L;
+		private IORuntimeException(IOException ioe) {
+			super(ioe);
+		}
+	}
+
 }
diff --git a/test/jrestless-test/src/main/java/com/jrestless/test/UtilityClassCodeCoverageBumper.java b/test/jrestless-test/src/main/java/com/jrestless/test/UtilityClassCodeCoverageBumper.java
@@ -21,7 +21,15 @@ public static <T> void invokePrivateConstructor(Class<T> clazz) {
 			constructor.newInstance();
 		} catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException
 				| IllegalArgumentException | InvocationTargetException e) {
-			throw new RuntimeException(e);
+			throw new ConstructorInvocationException(e);
 		}
 	}
+
+	public static final class ConstructorInvocationException extends RuntimeException {
+		private static final long serialVersionUID = 1L;
+		private ConstructorInvocationException(Exception e) {
+			super(e);
+		}
+
+	}
 }
diff --git a/test/jrestless-test/src/test/java/com/jrestless/test/DynamicJerseyTestRunnerTest.java b/test/jrestless-test/src/test/java/com/jrestless/test/DynamicJerseyTestRunnerTest.java
@@ -41,7 +41,7 @@ public void testRethrowsExceptionOnStartupFailure() throws Exception {
 			runner.runJerseyTest(jerseyTest, consumer);
 			fail("expected exception to be thrown");
 		} catch (RuntimeException re) {
-			assertSame(thrownException, re.getCause());
+			assertSame(thrownException, re);
 		}
 	}
 
@@ -64,7 +64,7 @@ public void testRethrowsExceptionOnTearDownFailure() throws Exception {
 			runner.runJerseyTest(jerseyTest, consumer);
 			fail("expected exception to be thrown");
 		} catch (RuntimeException re) {
-			assertSame(thrownException, re.getCause());
+			assertSame(thrownException, re);
 		}
 	}
 
@@ -117,7 +117,7 @@ public void testRethrowsTearDownExceptionOnConsumerAndTearDownFailure() throws E
 			runner.runJerseyTest(jerseyTest, consumer);
 			fail("expected exception to be thrown");
 		} catch (Exception e) {
-			assertSame(tearDownException, e.getCause());
+			assertSame(tearDownException, e);
 		}
 	}
 }