removed redundant catch block in try statement (#383)

apache · Dec 9, 2017 · cb075f9 · cb075f9
1 parent 8ac5031
commit cb075f9
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 19 deletions.
diff --git a/...mon-protobuf/src/test/java/io/servicecomb/codec/protobuf/jackson/TestParamSerializer.java b/...mon-protobuf/src/test/java/io/servicecomb/codec/protobuf/jackson/TestParamSerializer.java
@@ -28,7 +28,6 @@
 import org.mockito.Mockito;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.databind.SerializerProvider;
@@ -121,8 +120,6 @@ public void writeEndObject() throws IOException {
       paramSerializer.serialize(stringArray,
           obj,
           Mockito.mock(SerializerProvider.class));
-    } catch (JsonProcessingException e) {
-      status = false;
     } catch (IOException e) {
       status = false;
     }

diff --git a/...on-protobuf/src/test/java/io/servicecomb/codec/protobuf/jackson/TestResultSerializer.java b/...on-protobuf/src/test/java/io/servicecomb/codec/protobuf/jackson/TestResultSerializer.java
@@ -26,7 +26,6 @@
 import org.mockito.Mockito;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.databind.SerializerProvider;
@@ -121,8 +120,6 @@ public void writeEndObject() throws IOException {
       resultSerializer.serialize(stringArray,
           obj,
           Mockito.mock(SerializerProvider.class));
-    } catch (JsonProcessingException e) {
-      status = false;
     } catch (IOException e) {
       status = false;
     }

diff --git a/...rotobuf/src/test/java/io/servicecomb/codec/protobuf/jackson/TestStandardObjectWriter.java b/...rotobuf/src/test/java/io/servicecomb/codec/protobuf/jackson/TestStandardObjectWriter.java
@@ -67,10 +67,6 @@ public void writeValue(OutputStream out,
     try {
       StandardObjectWriter.writeValue(outputStream,
           stringArray);
-    } catch (JsonGenerationException e) {
-      status = false;
-    } catch (JsonMappingException e) {
-      status = false;
     } catch (IOException e) {
       status = false;
     }

diff --git a/core/src/test/java/io/servicecomb/core/TestConsumer.java b/core/src/test/java/io/servicecomb/core/TestConsumer.java
@@ -47,9 +47,6 @@ public void testConsumerProviderManager() {
     boolean validAssert = true;
     try {
       oConsumerProviderManager.getReferenceConfig("consumer provider manager");
-    } catch (Exception e) {
-      Assert.assertNotEquals(null, e);
-      validAssert = false;
     } catch (Throwable ee) {
       Assert.assertNotEquals(null, ee);
       validAssert = false;

diff --git a/...r-springmvc/src/test/java/org/springframework/web/client/TestCseHttpMessageConverter.java b/...r-springmvc/src/test/java/org/springframework/web/client/TestCseHttpMessageConverter.java
@@ -39,13 +39,12 @@ public void testAll() {
     lCseHttpMessageConverter.getSupportedMediaTypes();
     try {
       lCseHttpMessageConverter.read(this.getClass(), null);
-    } catch (HttpMessageNotReadableException e) {
-    } catch (IOException e) {
+    } catch (HttpMessageNotReadableException | IOException ignored) {
     }
     try {
       HttpOutputMessage httpOutputMessage = Mockito.mock(CseClientHttpRequest.class);
       lCseHttpMessageConverter.write(null, null, httpOutputMessage);
-    } catch (HttpMessageNotWritableException | IOException e) {
+    } catch (HttpMessageNotWritableException | IOException ignored) {
     }
 
     Assert.assertEquals(true, lCseHttpMessageConverter.canRead(null, null));

diff --git a/...t/src/test/java/io/servicecomb/transport/rest/servlet/TestRestServletContextListener.java b/...t/src/test/java/io/servicecomb/transport/rest/servlet/TestRestServletContextListener.java
@@ -32,9 +32,7 @@ public void testcontextInitializedException() {
 
     try {
       listener.contextInitialized(sce);
-    } catch (Exception e) {
-      status = false;
-    } catch (Error e) {
+    } catch (Exception | Error e) {
       status = false;
     }
     Assert.assertFalse(status);