optimize: some minor syntax optimization (#5869)

Signed-off-by: slievrly <slievrly@163.com>
apache · Sep 24, 2023 · 4c6d48e · 4c6d48e
1 parent 9fe8d3b
commit 4c6d48e
Show file tree

Hide file tree

Showing 47 changed files with 120 additions and 118 deletions.
diff --git a/changes/en-us/2.0.0.md b/changes/en-us/2.0.0.md
@@ -118,7 +118,7 @@ The version is updated as follows:
 - [[#5783](https://github.com/seata/seata/pull/5783)] support the nacos application name property
 - [[#5524](https://github.com/seata/seata/pull/5524)] support for more operational commands in seata-server.sh
 - [[#5836](https://github.com/seata/seata/pull/5836)] separate MySQL from Mariadb implementations
-
+- [[#5869](https://github.com/seata/seata/pull/5869)] some minor syntax optimization
 
 ### security:
 - [[#5642](https://github.com/seata/seata/pull/5642)] add Hessian Serializer WhiteDenyList

diff --git a/changes/zh-cn/2.0.0.md b/changes/zh-cn/2.0.0.md
@@ -118,6 +118,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
 - [[#5783](https://github.com/seata/seata/pull/5783)] 支持nacos上application name配置
 - [[#5524](https://github.com/seata/seata/pull/5524)] 支持 seata-server.sh 中的更多操作命令
 - [[#5836](https://github.com/seata/seata/pull/5836)] 分离mariadb和mysql的AT实现
+- [[#5869](https://github.com/seata/seata/pull/5869)] 优化一些小的语法
 
 
 ### security:

diff --git a/common/src/main/java/io/seata/common/util/BlobUtils.java b/common/src/main/java/io/seata/common/util/BlobUtils.java
@@ -64,7 +64,7 @@ public static String blob2string(Blob blob) {
         }
 
         try {
-            return new String(blob.getBytes((long) 1, (int) blob.length()), Constants.DEFAULT_CHARSET);
+            return new String(blob.getBytes(1, (int) blob.length()), Constants.DEFAULT_CHARSET);
         } catch (Exception e) {
             throw new ShouldNeverHappenException(e);
         }
@@ -100,7 +100,7 @@ public static byte[] blob2Bytes(Blob blob) {
         }
 
         try {
-            return blob.getBytes((long) 1, (int) blob.length());
+            return blob.getBytes(1, (int) blob.length());
         } catch (Exception e) {
             throw new ShouldNeverHappenException(e);
         }

diff --git a/common/src/main/java/io/seata/common/util/ReflectionUtil.java b/common/src/main/java/io/seata/common/util/ReflectionUtil.java
@@ -662,7 +662,7 @@ public static Object invokeStaticMethod(Class<?> targetClass, String staticMetho
      */
     public static Map<String, Object> getAnnotationValues(Annotation annotation) throws NoSuchFieldException {
         InvocationHandler h = Proxy.getInvocationHandler(annotation);
-        return (Map<String, Object>)getFieldValue(h, "memberValues");
+        return getFieldValue(h, "memberValues");
     }
 
     //endregion

diff --git a/...or/seata-compressor-deflater/src/main/java/io/seata/compressor/deflater/DeflaterUtil.java b/...or/seata-compressor-deflater/src/main/java/io/seata/compressor/deflater/DeflaterUtil.java
@@ -60,7 +60,7 @@ public static byte[] decompress(byte[] bytes) {
         Inflater inflater = new Inflater();
         inflater.setInput(bytes);
         byte[] outputBytes = new byte[BUFFER_SIZE];
-        try (ByteArrayOutputStream bos = new ByteArrayOutputStream();) {
+        try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
             while (!inflater.finished()) {
                 length = inflater.inflate(outputBytes);
                 if (length == 0) {

diff --git a/config/seata-config-core/src/test/java/io/seata/config/ConfigurationCacheTests.java b/config/seata-config-core/src/test/java/io/seata/config/ConfigurationCacheTests.java
@@ -58,7 +58,7 @@ public void testChangeValue() throws Exception {
         configuration.getLong("eee", 0);
         ConfigurationCache.getInstance().onChangeEvent(new ConfigurationChangeEvent("eee", "1"));
         long eee = configuration.getLong("eee", 0);
-        Assertions.assertEquals((long) 1, eee);
+        Assertions.assertEquals(1, eee);
 
         // test null
         configuration.getConfig("test", null);
@@ -71,7 +71,7 @@ public void testChangeValue() throws Exception {
         Assertions.assertNull(test);
     }
 
-    // FIXME: 2023/2/19 wait bugfix 
+    // FIXME: 2023/2/19 wait bugfix
     // @Test
     public void testConfigListener() throws Exception {
         Configuration configuration = new FileConfiguration("registry");

diff --git a/config/seata-config-core/src/test/java/io/seata/config/ProConfigurationFactoryTest.java b/config/seata-config-core/src/test/java/io/seata/config/ProConfigurationFactoryTest.java
@@ -35,8 +35,8 @@ void getInstance() {
         ConfigurationFactory.reload();
         Assertions.assertEquals(ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig("config.file.name"), "file-test-pro.conf");
         Assertions.assertEquals(ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig("config.file.testBlank"), "");
-        Assertions.assertEquals(ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig("config.file.testNull"), null);
-        Assertions.assertEquals(ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig("config.file.testExist"), null);
+        Assertions.assertNull(ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig("config.file.testNull"));
+        Assertions.assertNull(ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig("config.file.testExist"));
         Configuration instance = ConfigurationFactory.getInstance();
         Assertions.assertEquals(instance.getConfig("service.disableGlobalTransaction"), "true");
         Assertions.assertEquals(instance.getConfig("service.default.grouplist"), "127.0.0.1:8092");

diff --git a/config/seata-config-core/src/test/java/io/seata/config/YamlConfigurationFactoryTest.java b/config/seata-config-core/src/test/java/io/seata/config/YamlConfigurationFactoryTest.java
@@ -36,8 +36,8 @@ public void getInstance() {
         ConfigurationFactory.reload();
         Assertions.assertEquals(ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig("config.file.name"), "file-test-yaml.conf");
         Assertions.assertEquals(ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig("config.file.testBlank"), "");
-        Assertions.assertEquals(ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig("config.file.testNull"), null);
-        Assertions.assertEquals(ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig("config.file.testExist"), null);
+        Assertions.assertNull(ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig("config.file.testNull"));
+        Assertions.assertNull(ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig("config.file.testExist"));
         Configuration instance = ConfigurationFactory.getInstance();
         Assertions.assertEquals(instance.getConfig("service.disableGlobalTransaction"), "true");
         Assertions.assertEquals(instance.getConfig("service.default.grouplist"), "127.0.0.1:8093");

diff --git a/...tx-api/src/main/java/io/seata/integration/tx/api/remoting/parser/DubboRemotingParser.java b/...tx-api/src/main/java/io/seata/integration/tx/api/remoting/parser/DubboRemotingParser.java
@@ -49,7 +49,7 @@ public RemotingDesc getServiceDesc(Object bean, String beanName) throws Framewor
         try {
             RemotingDesc serviceBeanDesc = new RemotingDesc();
             Class<?> interfaceClass = (Class<?>)ReflectionUtil.invokeMethod(bean, "getInterfaceClass");
-            String interfaceClassName = (String)ReflectionUtil.getFieldValue(bean, "interfaceName");
+            String interfaceClassName = ReflectionUtil.getFieldValue(bean, "interfaceName");
             String version = (String)ReflectionUtil.invokeMethod(bean, "getVersion");
             String group = (String)ReflectionUtil.invokeMethod(bean, "getGroup");
             serviceBeanDesc.setServiceClass(interfaceClass);

diff --git a/...n-tx-api/src/main/java/io/seata/integration/tx/api/remoting/parser/HSFRemotingParser.java b/...n-tx-api/src/main/java/io/seata/integration/tx/api/remoting/parser/HSFRemotingParser.java
@@ -93,7 +93,7 @@ public RemotingDesc getServiceDesc(Object bean, String beanName) throws Framewor
                 Object metadata = ReflectionUtil.invokeMethod(consumerBean, "getMetadata");
 
                 String interfaceClassName = (String) ReflectionUtil.invokeMethod(metadata, "getInterfaceName");
-                Class<?> interfaceClass = (Class<?>) Class.forName(interfaceClassName);
+                Class<?> interfaceClass = Class.forName(interfaceClassName);
                 String uniqueId = (String) ReflectionUtil.invokeMethod(metadata, "getVersion");
                 String group = (String) ReflectionUtil.invokeMethod(metadata, "getGroup");
                 RemotingDesc serviceBeanDesc = new RemotingDesc();

diff --git a/...-api/src/main/java/io/seata/integration/tx/api/remoting/parser/SofaRpcRemotingParser.java b/...-api/src/main/java/io/seata/integration/tx/api/remoting/parser/SofaRpcRemotingParser.java
@@ -50,8 +50,8 @@ public RemotingDesc getServiceDesc(Object bean, String beanName) throws Framewor
         try {
             RemotingDesc serviceBeanDesc = new RemotingDesc();
             Class<?> interfaceClass = (Class<?>)ReflectionUtil.invokeMethod(bean, "getInterfaceClass");
-            String interfaceClassName = (String)ReflectionUtil.getFieldValue(bean, "interfaceType");
-            String uniqueId = (String)ReflectionUtil.getFieldValue(bean, "uniqueId");
+            String interfaceClassName = ReflectionUtil.getFieldValue(bean, "interfaceType");
+            String uniqueId = ReflectionUtil.getFieldValue(bean, "uniqueId");
             serviceBeanDesc.setServiceClass(interfaceClass);
             serviceBeanDesc.setServiceClassName(interfaceClassName);
             serviceBeanDesc.setUniqueId(uniqueId);

diff --git a/integration/http/src/test/java/io/seata/integration/http/HttpTest.java b/integration/http/src/test/java/io/seata/integration/http/HttpTest.java
@@ -212,7 +212,7 @@ public static String readStreamAsStr(InputStream is) throws IOException {
 
         src.close();
         dest.close();
-        return new String(bos.toByteArray(), "UTF-8");
+        return bos.toString("UTF-8");
     }
 
     @Test

diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/MultiUpdateExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/MultiUpdateExecutor.java
@@ -128,7 +128,7 @@ protected TableRecords afterImage(TableRecords beforeImage) throws SQLException
         TableMeta tmeta = getTableMeta(sqlRecognizers.get(0).getTableName());
         String selectSQL = buildAfterImageSQL(tmeta, beforeImage);
         ResultSet rs = null;
-        try (PreparedStatement pst = statementProxy.getConnection().prepareStatement(selectSQL);) {
+        try (PreparedStatement pst = statementProxy.getConnection().prepareStatement(selectSQL)) {
             SqlGenerateUtils.setParamForPk(beforeImage.pkRows(), getTableMeta().getPrimaryKeyOnlyName(), pst);
             rs = pst.executeQuery();
             return TableRecords.buildRecords(tmeta, rs);

diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/mysql/MySQLUpdateJoinExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/mysql/MySQLUpdateJoinExecutor.java
@@ -81,7 +81,7 @@ protected TableRecords beforeImage() throws SQLException {
         SQLUpdateRecognizer recognizer = (SQLUpdateRecognizer) sqlRecognizer;
         String tableNames = recognizer.getTableName();
         // update join sql,like update t1 inner join t2 on t1.id = t2.id set t1.name = ?; tableItems = {"update t1 inner join t2","t1","t2"}
-        String[] tableItems = tableNames.split(recognizer.MULTI_TABLE_NAME_SEPERATOR);
+        String[] tableItems = tableNames.split(SQLUpdateRecognizer.MULTI_TABLE_NAME_SEPERATOR);
         String joinTable = tableItems[0];
         final int itemTableIndex = 1;
         String suffixCommonCondition = buildBeforeImageSQLCommonConditionSuffix(paramAppenderList);
@@ -143,7 +143,7 @@ private String buildBeforeImageSQL(String joinTable, String itemTable,String suf
     protected TableRecords afterImage(TableRecords beforeImage) throws SQLException {
         SQLUpdateRecognizer recognizer = (SQLUpdateRecognizer) sqlRecognizer;
         String tableNames = recognizer.getTableName();
-        String[] tableItems = tableNames.split(recognizer.MULTI_TABLE_NAME_SEPERATOR);
+        String[] tableItems = tableNames.split(SQLUpdateRecognizer.MULTI_TABLE_NAME_SEPERATOR);
         String joinTable = tableItems[0];
         final int itemTableIndex = 1;
         ArrayList<List<Object>> joinConditionParams = new ArrayList<>();

diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/DataCompareUtilsTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/DataCompareUtilsTest.java
@@ -181,7 +181,7 @@ public void testRowListToMapWithSinglePk(){
         rows.add(row3);
 
         Map<String, Map<String, Field>> result =DataCompareUtils.rowListToMap(rows,primaryKeyList);
-        Assertions.assertTrue(result.size()==3);
+        Assertions.assertEquals(3, result.size());
         Assertions.assertEquals(result.keySet().iterator().next(),"1");
 
     }
@@ -216,7 +216,7 @@ public void testRowListToMapWithMultipPk(){
         rows.add(row3);
 
         Map<String, Map<String, Field>> result =DataCompareUtils.rowListToMap(rows,primaryKeyList);
-        Assertions.assertTrue(result.size()==3);
+        Assertions.assertEquals(3, result.size());
         Assertions.assertEquals(result.keySet().iterator().next(),"1_2");
 
     }

diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockDatabaseMetaData.java b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockDatabaseMetaData.java
@@ -734,7 +734,7 @@ public ResultSet getColumns(String catalog, String schemaPattern, String tableNa
         if(metas.isEmpty()){
             metas = Arrays.asList(columnsMetasReturnValue);
         }
-        return new MockResultSet((MockStatementBase) this.connection.createStatement())
+        return new MockResultSet(this.connection.createStatement())
             .mockResultSet(columnMetaColumnLabels, metas.toArray(new Object[0][]));
     }
 
@@ -791,7 +791,7 @@ public ResultSet getTypeInfo() throws SQLException {
     @Override
     public ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate)
         throws SQLException {
-        return new MockResultSet((MockStatementBase)this.connection.createStatement())
+        return new MockResultSet(this.connection.createStatement())
                 .mockResultSet(indexMetaColumnLabels, indexMetasReturnValue);
     }
 

diff --git a/...rce/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleInsertRecognizerTest.java b/...rce/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleInsertRecognizerTest.java
@@ -119,7 +119,7 @@ public void testGetInsertRows() {
     @Test
     public void testNotPlaceholder_giveValidPkIndex() {
         String sql = "insert into test(create_time) values(sysdate)";
-        List<SQLStatement> sqlStatements = SQLUtils.parseStatements(sql, DB_TYPE);;
+        List<SQLStatement> sqlStatements = SQLUtils.parseStatements(sql, DB_TYPE);
 
         OracleInsertRecognizer oracle = new OracleInsertRecognizer(sql, sqlStatements.get(0));
         List<List<Object>> insertRows = oracle.getInsertRows(Collections.singletonList(-1));

diff --git a/...test/java/io/seata/rm/datasource/sql/druid/postgresql/PostgresqlInsertRecognizerTest.java b/...test/java/io/seata/rm/datasource/sql/druid/postgresql/PostgresqlInsertRecognizerTest.java
@@ -104,7 +104,7 @@ public void testGetInsertRows() {
 
         SQLInsertRecognizer recognizer = (SQLInsertRecognizer) SQLVisitorFactory.get(sql, DB_TYPE).get(0);
         List<List<Object>> insertRows = recognizer.getInsertRows(Collections.singletonList(pkIndex));
-        Assertions.assertTrue(insertRows.size() == 1);
+        Assertions.assertEquals(1, insertRows.size());
 
         //test for exception
         Assertions.assertThrows(SQLParsingException.class, () -> {

diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/ColumnMetaTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/ColumnMetaTest.java
@@ -31,9 +31,6 @@ public void testColumnMeta() {
         Assertions.assertEquals(columnMeta, new ColumnMeta());
         columnMeta.setIsAutoincrement("Yes");
         Assertions.assertTrue(columnMeta.isAutoincrement());
-        Assertions.assertEquals(columnMeta, columnMeta);
-        Assertions.assertEquals(columnMeta.hashCode(), columnMeta.hashCode());
-        Assertions.assertNotEquals(columnMeta, "");
 
         ColumnMeta other = new ColumnMeta();
         other.setTableCat("");

diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/IndexMetaTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/IndexMetaTest.java
@@ -32,9 +32,6 @@ public void testIndexMeta() {
         IndexMeta indexMeta = new IndexMeta();
         indexMeta.setValues(Lists.newArrayList());
         Assertions.assertNotNull(indexMeta.toString());
-        Assertions.assertEquals(indexMeta, indexMeta);
-        Assertions.assertEquals(indexMeta.hashCode(), indexMeta.hashCode());
-        Assertions.assertNotEquals(indexMeta, "");
 
         IndexMeta other = new IndexMeta();
         other.setValues(Lists.newArrayList(new ColumnMeta()));

diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaTest.java
@@ -37,10 +37,7 @@ public class TableMetaTest {
     @Test
     public void testTableMeta() {
         TableMeta tableMeta = new TableMeta();
-        Assertions.assertEquals(tableMeta, tableMeta);
         Assertions.assertEquals(tableMeta, new TableMeta());
-        Assertions.assertEquals(tableMeta.hashCode(), tableMeta.hashCode());
-        Assertions.assertNotEquals(tableMeta, "");
 
         TableMeta other = new TableMeta();
         other.setTableName("");

diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/AbstractUndoExecutorTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/AbstractUndoExecutorTest.java
@@ -160,7 +160,7 @@ public void dataValidationDelete() throws SQLException {
     @Test
     public void testParsePK() {
         TableMeta tableMeta = Mockito.mock(TableMeta.class);
-        Mockito.when(tableMeta.getPrimaryKeyOnlyName()).thenReturn(Arrays.asList(new String[]{"id"}));
+        Mockito.when(tableMeta.getPrimaryKeyOnlyName()).thenReturn(Arrays.asList("id"));
         Mockito.when(tableMeta.getTableName()).thenReturn("table_name");
 
         TableRecords beforeImage = new TableRecords();

diff --git a/rm-datasource/src/test/java/io/seata/rm/xa/DataSourceProxyXANativeTest.java b/rm-datasource/src/test/java/io/seata/rm/xa/DataSourceProxyXANativeTest.java
@@ -52,9 +52,9 @@ public void testGetConnection() throws SQLException {
 
         Assertions.assertTrue(connFromDataSourceProxyXANative instanceof ConnectionProxyXA);
         XAConnection xaConnectionFromProxy = ((ConnectionProxyXA)connFromDataSourceProxyXANative).getWrappedXAConnection();
-        Assertions.assertTrue(xaConnection == xaConnectionFromProxy);
+        Assertions.assertSame(xaConnection, xaConnectionFromProxy);
         Connection connectionFromProxy = ((ConnectionProxyXA)connFromDataSourceProxyXANative).getWrappedConnection();
-        Assertions.assertTrue(connection == connectionFromProxy);
+        Assertions.assertSame(connection, connectionFromProxy);
 
     }
 }
diff --git a/rm-datasource/src/test/java/io/seata/rm/xa/DataSourceProxyXATest.java b/rm-datasource/src/test/java/io/seata/rm/xa/DataSourceProxyXATest.java
@@ -83,7 +83,7 @@ public void testGetConnection() throws SQLException {
         Assertions.assertTrue(wrappedConnection instanceof PooledConnection);
 
         Connection wrappedPhysicalConn = ((PooledConnection)wrappedConnection).getConnection();
-        Assertions.assertTrue(wrappedPhysicalConn == connection);
+        Assertions.assertSame(wrappedPhysicalConn, connection);
 
         XAConnection xaConnection = connectionProxyXA.getWrappedXAConnection();
         Connection connectionInXA = xaConnection.getConnection();
@@ -117,7 +117,7 @@ public void testGetMariaXaConnection() throws SQLException {
         Assertions.assertTrue(wrappedConnection instanceof PooledConnection);
 
         Connection wrappedPhysicalConn = ((PooledConnection)wrappedConnection).getConnection();
-        Assertions.assertTrue(wrappedPhysicalConn == connection);
+        Assertions.assertSame(wrappedPhysicalConn, connection);
 
         XAConnection xaConnection = connectionProxyXA.getWrappedXAConnection();
         Connection connectionInXA = xaConnection.getConnection();

diff --git a/...-engine-store/src/main/java/io/seata/saga/engine/store/db/DbAndReportTcStateLogStore.java b/...-engine-store/src/main/java/io/seata/saga/engine/store/db/DbAndReportTcStateLogStore.java
@@ -407,7 +407,7 @@ private int getIdIndex(String stateInstanceId, String separator) {
         if (StringUtils.hasLength(stateInstanceId)) {
             int start = stateInstanceId.lastIndexOf(separator);
             if (start > 0) {
-                String indexStr = stateInstanceId.substring(start + 1, stateInstanceId.length());
+                String indexStr = stateInstanceId.substring(start + 1);
                 try {
                     return Integer.parseInt(indexStr);
                 } catch (NumberFormatException e) {
@@ -635,7 +635,7 @@ public StateMachineInstance getStateMachineInstanceByBusinessKey(String business
     private void deserializeParamsAndException(StateMachineInstance stateMachineInstance) {
         byte[] serializedException = (byte[]) stateMachineInstance.getSerializedException();
         if (serializedException != null) {
-            stateMachineInstance.setException((Exception) exceptionSerializer.deserialize(serializedException));
+            stateMachineInstance.setException(exceptionSerializer.deserialize(serializedException));
         }
 
         String serializedStartParams = (String) stateMachineInstance.getSerializedStartParams();
@@ -677,7 +677,7 @@ private void deserializeParamsAndException(StateInstance stateInstance) {
             }
             byte[] serializedException = (byte[]) stateInstance.getSerializedException();
             if (serializedException != null) {
-                stateInstance.setException((Exception) exceptionSerializer.deserialize(serializedException));
+                stateInstance.setException(exceptionSerializer.deserialize(serializedException));
             }
         }
     }

diff --git a/...gine/src/main/java/io/seata/saga/engine/evaluation/exception/ExceptionMatchEvaluator.java b/...gine/src/main/java/io/seata/saga/engine/evaluation/exception/ExceptionMatchEvaluator.java
@@ -44,7 +44,7 @@ public class ExceptionMatchEvaluator implements Evaluator {
     public boolean evaluate(Map<String, Object> variables) {
 
         Object eObj = variables.get(getRootObjectName());
-        if (eObj != null && (eObj instanceof Exception) && StringUtils.hasText(exceptionString)) {
+        if ((eObj instanceof Exception) && StringUtils.hasText(exceptionString)) {
 
             Exception e = (Exception)eObj;
 

diff --git a/...ta-saga-engine/src/main/java/io/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java b/...ta-saga-engine/src/main/java/io/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java
@@ -295,8 +295,8 @@ protected StateMachineInstance forwardInternal(String stateMachineInstId, Map<St
 
                 String next = null;
                 State state = stateMachineInstance.getStateMachine().getState(EngineUtils.getOriginStateName(lastForwardState));
-                if (state != null && state instanceof AbstractTaskState) {
-                    next = ((AbstractTaskState)state).getNext();
+                if (state instanceof AbstractTaskState) {
+                    next = state.getNext();
                 }
                 if (StringUtils.isEmpty(next)) {
                     LOGGER.warn(

diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/routers/TaskStateRouter.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/routers/TaskStateRouter.java
@@ -139,7 +139,7 @@ private Instruction compensateRoute(ProcessContext context, State compensationTr
 
             StateMachine stateMachine = (StateMachine)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE);
             State state = stateMachine.getState(EngineUtils.getOriginStateName(stateToBeCompensated));
-            if (state != null && state instanceof AbstractTaskState) {
+            if (state instanceof AbstractTaskState) {
 
                 AbstractTaskState taskState = (AbstractTaskState)state;
 

diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/RecoverStrategy.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/RecoverStrategy.java
@@ -30,5 +30,5 @@ public enum RecoverStrategy {
     /**
      * Forward
      */
-    Forward;
+    Forward
 }