use @SneakyThrow to instead of never occurred exception

apache · Sep 28, 2018 · 0623d39 · 0623d39
1 parent b4ea029
commit 0623d39
Show file tree

Hide file tree

Showing 50 changed files with 436 additions and 462 deletions.
diff --git a/sharding-core/src/main/java/io/shardingsphere/spi/NewInstanceServiceLoader.java b/sharding-core/src/main/java/io/shardingsphere/spi/NewInstanceServiceLoader.java
@@ -17,9 +17,9 @@
 
 package io.shardingsphere.spi;
 
-import io.shardingsphere.core.exception.ShardingException;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -57,14 +57,11 @@ public static <T> NewInstanceServiceLoader<T> load(final Class<T> service) {
      * 
      * @return service instances
      */
+    @SneakyThrows
     public Collection<T> newServiceInstances() {
         Collection<T> result = new LinkedList<>();
         for (Class<T> each : serviceClasses) {
-            try {
-                result.add(each.newInstance());
-            } catch (final ReflectiveOperationException ex) {
-                throw new ShardingException(ex);
-            }
+            result.add(each.newInstance());
         }
         return result;
     }

diff --git a/sharding-core/src/test/java/io/shardingsphere/core/executor/fixture/ExecutorTestUtil.java b/sharding-core/src/test/java/io/shardingsphere/core/executor/fixture/ExecutorTestUtil.java
@@ -22,6 +22,7 @@
 import io.shardingsphere.core.executor.sql.execute.threadlocal.ExecutorExceptionHandler;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
 
 import java.lang.reflect.Field;
 
@@ -32,7 +33,7 @@ public final class ExecutorTestUtil {
      * Listen event.
      *
      * @param eventCaller event caller
-     * @param event       SQL execution event
+     * @param event SQL execution event
      */
     public static void listen(final EventCaller eventCaller, final SQLExecutionEvent event) {
         eventCaller.verifyDataSource(event.getRouteUnit().getDataSourceName());
@@ -46,10 +47,9 @@ public static void listen(final EventCaller eventCaller, final SQLExecutionEvent
 
     /**
      * Clear thread local.
-     *
-     * @throws ReflectiveOperationException reflective operation exception
      */
-    public static void clear() throws ReflectiveOperationException {
+    @SneakyThrows
+    public static void clear() {
         Field field = ExecutorExceptionHandler.class.getDeclaredField("IS_EXCEPTION_THROWN");
         field.setAccessible(true);
         ((ThreadLocal) field.get(ExecutorExceptionHandler.class)).remove();

diff --git a/...c/test/java/io/shardingsphere/core/executor/threadlocal/ExecutorExceptionHandlerTest.java b/...c/test/java/io/shardingsphere/core/executor/threadlocal/ExecutorExceptionHandlerTest.java
@@ -30,7 +30,7 @@
 public class ExecutorExceptionHandlerTest {
 
     @After
-    public void tearDown() throws ReflectiveOperationException {
+    public void tearDown() {
         ExecutorTestUtil.clear();
     }
 

diff --git a/sharding-core/src/test/java/io/shardingsphere/core/keygen/DefaultKeyGeneratorTest.java b/sharding-core/src/test/java/io/shardingsphere/core/keygen/DefaultKeyGeneratorTest.java
@@ -18,6 +18,7 @@
 package io.shardingsphere.core.keygen;
 
 import io.shardingsphere.core.keygen.fixture.FixedTimeService;
+import lombok.SneakyThrows;
 import org.junit.Test;
 
 import java.lang.reflect.Field;
@@ -80,7 +81,8 @@ public void assertSetWorkerIdFailureWhenTooMuch() {
     }
 
     @Test
-    public void assertSetWorkerIdSuccess() throws NoSuchFieldException, IllegalAccessException {
+    @SneakyThrows
+    public void assertSetWorkerIdSuccess() {
         DefaultKeyGenerator.setWorkerId(1L);
         Field workerIdField = DefaultKeyGenerator.class.getDeclaredField("workerId");
         workerIdField.setAccessible(true);

diff --git a/...src/test/java/io/shardingsphere/core/parsing/integrate/asserts/ParserResultSetLoader.java b/...src/test/java/io/shardingsphere/core/parsing/integrate/asserts/ParserResultSetLoader.java
@@ -20,9 +20,9 @@
 import com.google.common.base.Preconditions;
 import io.shardingsphere.core.parsing.integrate.jaxb.root.ParserResult;
 import io.shardingsphere.core.parsing.integrate.jaxb.root.ParserResultSet;
+import lombok.SneakyThrows;
 
 import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
 import java.io.File;
 import java.net.URL;
 import java.util.HashMap;
@@ -64,14 +64,11 @@ private Map<String, ParserResult> loadParserResultSet() {
         return result;
     }
 
+    @SneakyThrows
     private Map<String, ParserResult> loadParserResultSet(final File file) {
         Map<String, ParserResult> result = new HashMap<>(Short.MAX_VALUE, 1);
-        try {
-            for (ParserResult each : ((ParserResultSet) JAXBContext.newInstance(ParserResultSet.class).createUnmarshaller().unmarshal(file)).getParserResults()) {
-                result.put(each.getSqlCaseId(), each);
-            }
-        } catch (JAXBException ex) {
-            throw new RuntimeException(ex);
+        for (ParserResult each : ((ParserResultSet) JAXBContext.newInstance(ParserResultSet.class).createUnmarshaller().unmarshal(file)).getParserResults()) {
+            result.put(each.getSqlCaseId(), each);
         }
         return result;
     }

diff --git a/...test/java/io/shardingsphere/core/parsing/integrate/asserts/condition/ConditionAssert.java b/...test/java/io/shardingsphere/core/parsing/integrate/asserts/condition/ConditionAssert.java
@@ -26,6 +26,7 @@
 import io.shardingsphere.core.parsing.parser.context.condition.Condition;
 import io.shardingsphere.core.parsing.parser.context.condition.OrCondition;
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 
 import java.lang.reflect.Field;
 import java.util.Map;
@@ -85,13 +86,10 @@ private void assertCondition(final Condition actual, final ExpectedCondition exp
         }
     }
 
+    @SneakyThrows
     private Object getField(final Object actual, final String fieldName) {
-        try {
-            Field field = actual.getClass().getDeclaredField(fieldName);
-            field.setAccessible(true);
-            return field.get(actual);
-        } catch (final ReflectiveOperationException ex) {
-            throw new RuntimeException(ex);
-        }
+        Field field = actual.getClass().getDeclaredField(fieldName);
+        field.setAccessible(true);
+        return field.get(actual);
     }
 }
diff --git a/...io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractShardingPreparedStatementAdapter.java b/...io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractShardingPreparedStatementAdapter.java
@@ -17,10 +17,10 @@
 
 package io.shardingsphere.shardingjdbc.jdbc.adapter;
 
-import io.shardingsphere.core.exception.ShardingException;
 import io.shardingsphere.shardingjdbc.jdbc.adapter.invocation.SetParameterMethodInvocation;
 import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationPreparedStatement;
 import lombok.Getter;
+import lombok.SneakyThrows;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -257,14 +257,6 @@ private void setParameter(final int parameterIndex, final Object value) {
         parameters.set(parameterIndex - 1, value);
     }
 
-    private void recordSetParameter(final String methodName, final Class[] argumentTypes, final Object... arguments) {
-        try {
-            setParameterMethodInvocations.add(new SetParameterMethodInvocation(PreparedStatement.class.getMethod(methodName, argumentTypes), arguments, arguments[1]));
-        } catch (final NoSuchMethodException ex) {
-            throw new ShardingException(ex);
-        }
-    }
-
     protected final void replaySetParameter(final PreparedStatement preparedStatement, final List<Object> parameters) {
         setParameterMethodInvocations.clear();
         addParameters(parameters);
@@ -275,10 +267,15 @@ protected final void replaySetParameter(final PreparedStatement preparedStatemen
 
     private void addParameters(final List<Object> parameters) {
         for (int i = 0; i < parameters.size(); i++) {
-            recordSetParameter("setObject", new Class[]{int.class, Object.class}, i + 1, parameters.get(i));
+            setParameter(new Class[]{int.class, Object.class}, i + 1, parameters.get(i));
         }
     }
 
+    @SneakyThrows
+    private void setParameter(final Class[] argumentTypes, final Object... arguments) {
+        setParameterMethodInvocations.add(new SetParameterMethodInvocation(PreparedStatement.class.getMethod("setObject", argumentTypes), arguments, arguments[1]));
+    }
+
     @Override
     public final void clearParameters() {
         parameters.clear();

diff --git a/...g-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/WrapperAdapter.java b/...g-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/WrapperAdapter.java
@@ -17,8 +17,8 @@
 
 package io.shardingsphere.shardingjdbc.jdbc.adapter;
 
-import io.shardingsphere.core.exception.ShardingException;
 import io.shardingsphere.shardingjdbc.jdbc.adapter.invocation.JdbcMethodInvocation;
+import lombok.SneakyThrows;
 
 import java.sql.SQLException;
 import java.sql.Wrapper;
@@ -56,12 +56,9 @@ public final boolean isWrapperFor(final Class<?> iface) {
      * @param argumentTypes argument types
      * @param arguments arguments
      */
+    @SneakyThrows
     public final void recordMethodInvocation(final Class<?> targetClass, final String methodName, final Class<?>[] argumentTypes, final Object[] arguments) {
-        try {
-            jdbcMethodInvocations.add(new JdbcMethodInvocation(targetClass.getMethod(methodName, argumentTypes), arguments));
-        } catch (final NoSuchMethodException ex) {
-            throw new ShardingException(ex);
-        }
+        jdbcMethodInvocations.add(new JdbcMethodInvocation(targetClass.getMethod(methodName, argumentTypes), arguments));
     }
 
     /**

diff --git a/...ain/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/JdbcMethodInvocation.java b/...ain/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/JdbcMethodInvocation.java
@@ -17,11 +17,10 @@
 
 package io.shardingsphere.shardingjdbc.jdbc.adapter.invocation;
 
-import io.shardingsphere.core.exception.ShardingException;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 /**
@@ -43,11 +42,8 @@ public class JdbcMethodInvocation {
      * 
      * @param target target object
      */
+    @SneakyThrows
     public void invoke(final Object target) {
-        try {
-            method.invoke(target, arguments);
-        } catch (final IllegalAccessException | InvocationTargetException ex) {
-            throw new ShardingException("Invoke jdbc method exception", ex);
-        }
+        method.invoke(target, arguments);
     }
 }
diff --git a/.../main/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/MasterSlaveDataSource.java b/.../main/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/MasterSlaveDataSource.java
@@ -27,7 +27,6 @@
 import lombok.Getter;
 
 import javax.sql.DataSource;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.sql.SQLException;
 import java.util.Collection;
@@ -101,7 +100,7 @@ private void closeOriginalDataSources() {
             try {
                 Method closeMethod = each.getClass().getDeclaredMethod("close");
                 closeMethod.invoke(each);
-            } catch (final NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {
+            } catch (final ReflectiveOperationException ignored) {
             }
         }
     }

diff --git a/...core/src/test/java/io/shardingsphere/dbtest/cases/assertion/IntegrateTestCasesLoader.java b/...core/src/test/java/io/shardingsphere/dbtest/cases/assertion/IntegrateTestCasesLoader.java
@@ -28,6 +28,7 @@
 import io.shardingsphere.dbtest.cases.assertion.dql.DQLIntegrateTestCases;
 import io.shardingsphere.dbtest.cases.assertion.root.IntegrateTestCase;
 import io.shardingsphere.dbtest.cases.assertion.root.IntegrateTestCases;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.xml.bind.JAXBContext;
@@ -74,15 +75,12 @@ public final class IntegrateTestCasesLoader {
 
     private final Map<String, IntegrateTestCase> dclIntegrateTestCaseMap;
 
+    @SneakyThrows
     private IntegrateTestCasesLoader() {
-        try {
-            dqlIntegrateTestCaseMap = loadIntegrateTestCases(DQL_INTEGRATE_TEST_CASES_FILE_PREFIX);
-            dmlIntegrateTestCaseMap = loadIntegrateTestCases(DML_INTEGRATE_TEST_CASES_FILE_PREFIX);
-            ddlIntegrateTestCaseMap = loadIntegrateTestCases(DDL_INTEGRATE_TEST_CASES_FILE_PREFIX);
-            dclIntegrateTestCaseMap = loadIntegrateTestCases(DCL_INTEGRATE_TEST_CASES_FILE_PREFIX);
-        } catch (final IOException | URISyntaxException | JAXBException ex) {
-            throw new RuntimeException(ex);
-        }
+        dqlIntegrateTestCaseMap = loadIntegrateTestCases(DQL_INTEGRATE_TEST_CASES_FILE_PREFIX);
+        dmlIntegrateTestCaseMap = loadIntegrateTestCases(DML_INTEGRATE_TEST_CASES_FILE_PREFIX);
+        ddlIntegrateTestCaseMap = loadIntegrateTestCases(DDL_INTEGRATE_TEST_CASES_FILE_PREFIX);
+        dclIntegrateTestCaseMap = loadIntegrateTestCases(DCL_INTEGRATE_TEST_CASES_FILE_PREFIX);
     }
 
     /**

diff --git a/...-core/src/test/java/io/shardingsphere/shardingjdbc/api/ShardingDataSourceFactoryTest.java b/...-core/src/test/java/io/shardingsphere/shardingjdbc/api/ShardingDataSourceFactoryTest.java
@@ -22,6 +22,7 @@
 import io.shardingsphere.api.config.TableRuleConfiguration;
 import io.shardingsphere.core.rule.ShardingRule;
 import io.shardingsphere.shardingjdbc.jdbc.core.ShardingContext;
+import lombok.SneakyThrows;
 import org.junit.Test;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
@@ -47,7 +48,7 @@
 public final class ShardingDataSourceFactoryTest {
 
     @Test
-    public void assertCreateDataSourceWithShardingRuleAndConfigMapAndProperties() throws SQLException, NoSuchFieldException, IllegalAccessException {
+    public void assertCreateDataSourceWithShardingRuleAndConfigMapAndProperties() throws SQLException {
         ShardingRuleConfiguration shardingRuleConfig = createShardingRuleConfig();
         Properties props = new Properties();
         Map<String, Object> configMap = new ConcurrentHashMap<>();
@@ -72,8 +73,8 @@ private Map<String, DataSource> getDataSourceMap() throws SQLException {
         when(connection.createStatement()).thenReturn(statement);
         when(statement.executeQuery(Mockito.anyString())).thenReturn(resultSet);
         when(statement.getConnection()).thenReturn(connection);
-        when(statement.getConnection().getMetaData().getTables(ArgumentMatchers.<String>any(), ArgumentMatchers.<String>any(),
-                ArgumentMatchers.<String>any(), ArgumentMatchers.<String[]>any())).thenReturn(resultSet);
+        when(statement.getConnection().getMetaData().getTables(
+                ArgumentMatchers.<String>any(), ArgumentMatchers.<String>any(), ArgumentMatchers.<String>any(), ArgumentMatchers.<String[]>any())).thenReturn(resultSet);
         when(resultSet.next()).thenReturn(false);
         Map<String, DataSource> result = new HashMap<>(1);
         when(statement.getConnection().getMetaData().getURL()).thenReturn("jdbc:h2:mem:demo_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL");
@@ -90,13 +91,15 @@ private ShardingRuleConfiguration createShardingRuleConfig() {
         return result;
     }
 
-    private ShardingRule getShardingRule(final DataSource dataSource) throws NoSuchFieldException, IllegalAccessException {
+    @SneakyThrows
+    private ShardingRule getShardingRule(final DataSource dataSource) {
         Field field = dataSource.getClass().getDeclaredField("shardingContext");
         field.setAccessible(true);
         return ((ShardingContext) field.get(dataSource)).getShardingRule();
     }
 
-    private Properties getShardingProperties(final DataSource dataSource) throws NoSuchFieldException, IllegalAccessException {
+    @SneakyThrows
+    private Properties getShardingProperties(final DataSource dataSource) {
         Field shardingPropertiesField = dataSource.getClass().getDeclaredField("shardingProperties");
         shardingPropertiesField.setAccessible(true);
         Field propsField = shardingPropertiesField.get(dataSource).getClass().getDeclaredField("props");

diff --git a/...-core/src/test/java/io/shardingsphere/shardingjdbc/executor/AbstractBaseExecutorTest.java b/...-core/src/test/java/io/shardingsphere/shardingjdbc/executor/AbstractBaseExecutorTest.java
@@ -58,7 +58,7 @@ public abstract class AbstractBaseExecutorTest {
     private TestDMLExecutionEventListener dmlExecutionEventListener;
 
     @Before
-    public void setUp() throws SQLException, ReflectiveOperationException {
+    public void setUp() throws SQLException {
         MockitoAnnotations.initMocks(this);
         ExecutorExceptionHandler.setExceptionThrown(false);
         executeEngine = new ShardingExecuteEngine(Runtime.getRuntime().availableProcessors());
@@ -87,7 +87,7 @@ private void setConnection() throws SQLException {
     }
 
     @After
-    public void tearDown() throws ReflectiveOperationException {
+    public void tearDown() {
         ExecutorTestUtil.clear();
         ShardingEventBusInstance.getInstance().unregister(dqlExecutionEventListener);
         ShardingEventBusInstance.getInstance().unregister(dmlExecutionEventListener);