* Remove redundant local variables

Author: arrow1991

apollo-audit/apollo-audit-impl/src/main/java/com/ctrip/framework/apollo/audit/aop/ApolloAuditSpanAspect.java

@@ -99,8 +99,7 @@ Method findMethod(ProceedingJoinPoint pjp) {
       parameterTypes = ((MethodSignature) pjpSignature).getParameterTypes();
     }
     try {
-      Method method = ReflectUtils.findDeclaredMethod(clazz, methodName, parameterTypes);
-      return method;
+      return ReflectUtils.findDeclaredMethod(clazz, methodName, parameterTypes);
     } catch (NoSuchMethodException e) {
       return null;
     }

apollo-audit/apollo-audit-impl/src/main/java/com/ctrip/framework/apollo/audit/component/ApolloAuditHttpInterceptor.java

@@ -37,7 +37,6 @@ public ClientHttpResponse intercept(HttpRequest request, byte[] body,
     if (traceContext.tracer() != null) {
       request = traceContext.tracer().inject(request);
     }
-    ClientHttpResponse response = execution.execute(request, body);
-    return response;
+    return execution.execute(request, body);
   }
 }

apollo-audit/apollo-audit-impl/src/main/java/com/ctrip/framework/apollo/audit/controller/ApolloAuditController.java

@@ -55,15 +55,13 @@ public ApolloAuditProperties getProperties() {
   @GetMapping("/logs")
   @PreAuthorize(value = "@apolloAuditLogQueryApiPreAuthorizer.hasQueryPermission()")
   public List<ApolloAuditLogDTO> findAllAuditLogs(int page, int size) {
-    List<ApolloAuditLogDTO> logDTOList = api.queryLogs(page, size);
-    return logDTOList;
+    return api.queryLogs(page, size);
   }
 
   @GetMapping("/trace")
   @PreAuthorize(value = "@apolloAuditLogQueryApiPreAuthorizer.hasQueryPermission()")
   public List<ApolloAuditLogDetailsDTO> findTraceDetails(@RequestParam String traceId) {
-    List<ApolloAuditLogDetailsDTO> detailsDTOList = api.queryTraceDetails(traceId);
-    return detailsDTOList;
+    return api.queryTraceDetails(traceId);
   }
 
   @GetMapping("/logs/opName")
@@ -74,27 +72,22 @@ public List<ApolloAuditLogDTO> findAllAuditLogsByOpNameAndTime(@RequestParam Str
       @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss.S") Date startDate,
       @RequestParam(value = "endDate", required = false)
       @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss.S") Date endDate) {
-    List<ApolloAuditLogDTO> logDTOList =
-        api.queryLogsByOpName(opName, startDate, endDate, page, size);
-    return logDTOList;
+    return api.queryLogsByOpName(opName, startDate, endDate, page, size);
   }
 
   @GetMapping("/logs/dataInfluences/field")
   @PreAuthorize(value = "@apolloAuditLogQueryApiPreAuthorizer.hasQueryPermission()")
   public List<ApolloAuditLogDataInfluenceDTO> findDataInfluencesByField(
       @RequestParam String entityName, @RequestParam String entityId,
       @RequestParam String fieldName, int page, int size) {
-    List<ApolloAuditLogDataInfluenceDTO> dataInfluenceDTOList =
-        api.queryDataInfluencesByField(entityName, entityId, fieldName, page, size);
-    return dataInfluenceDTOList;
+    return api.queryDataInfluencesByField(entityName, entityId, fieldName, page, size);
   }
 
   @GetMapping("/logs/by-name-or-type-or-operator")
   @PreAuthorize(value = "@apolloAuditLogQueryApiPreAuthorizer.hasQueryPermission()")
   public List<ApolloAuditLogDTO> findAuditLogsByNameOrTypeOrOperator(@RequestParam String query,
       int page, int size) {
-    List<ApolloAuditLogDTO> logDTOList = api.searchLogByNameOrTypeOrOperator(query, page, size);
-    return logDTOList;
+    return api.searchLogByNameOrTypeOrOperator(query, page, size);
   }
 
 }

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/grayReleaseRule/GrayReleaseRulesHolder.java

@@ -283,13 +283,9 @@ private GrayReleaseRuleCache transformRuleToRuleCache(GrayReleaseRule grayReleas
       Tracer.logError(ex);
       logger.error("parse rule for gray release rule {} failed", grayReleaseRule.getId(), ex);
     }
-
-    GrayReleaseRuleCache ruleCache =
-        new GrayReleaseRuleCache(grayReleaseRule.getId(), grayReleaseRule.getBranchName(),
-            grayReleaseRule.getNamespaceName(), grayReleaseRule.getReleaseId(),
-            grayReleaseRule.getBranchStatus(), loadVersion.get(), ruleItems);
-
-    return ruleCache;
+    return new GrayReleaseRuleCache(grayReleaseRule.getId(), grayReleaseRule.getBranchName(),
+        grayReleaseRule.getNamespaceName(), grayReleaseRule.getReleaseId(),
+        grayReleaseRule.getBranchStatus(), loadVersion.get(), ruleItems);
   }
 
   private void populateDataBaseInterval() {

apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/grayReleaseRule/GrayReleaseRulesHolderTest.java

@@ -198,8 +198,6 @@ private GrayReleaseRuleItemDTO assembleRuleItem(String clientAppId, Set<String>
   private ReleaseMessage assembleReleaseMessage(String appId, String clusterName,
       String namespaceName) {
     String message = STRING_JOINER.join(appId, clusterName, namespaceName);
-    ReleaseMessage releaseMessage = new ReleaseMessage(message);
-
-    return releaseMessage;
+    return new ReleaseMessage(message);
   }
 }

apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerV2Test.java

@@ -414,8 +414,7 @@ private String transformApolloConfigNotificationsToString(String namespace, long
 
   private ApolloConfigNotification assembleApolloConfigNotification(String namespace,
       long notificationId) {
-    ApolloConfigNotification notification = new ApolloConfigNotification(namespace, notificationId);
-    return notification;
+    return new ApolloConfigNotification(namespace, notificationId);
   }
 
   private Multimap<String, String> assembleMultiMap(String key, Iterable<String> values) {

apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/integration/NotificationControllerV2IntegrationTest.java

@@ -706,7 +706,6 @@ private String transformApolloConfigNotificationsToString(String namespace, long
 
   private ApolloConfigNotification assembleApolloConfigNotification(String namespace,
       long notificationId) {
-    ApolloConfigNotification notification = new ApolloConfigNotification(namespace, notificationId);
-    return notification;
+    return new ApolloConfigNotification(namespace, notificationId);
   }
 }

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/AdminServiceAPI.java

@@ -373,10 +373,9 @@ public List<ReleaseDTO> findActiveReleases(String appId, Env env, String cluster
 
     public ReleaseDTO loadLatestRelease(String appId, Env env, String clusterName,
         String namespace) {
-      ReleaseDTO releaseDTO = restTemplate.get(env,
+      return restTemplate.get(env,
           "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/latest",
           ReleaseDTO.class, appId, clusterName, namespace);
-      return releaseDTO;
     }
 
     public ReleaseDTO createRelease(String appId, Env env, String clusterName, String namespace,
@@ -390,10 +389,9 @@ public ReleaseDTO createRelease(String appId, Env env, String clusterName, Strin
       parameters.add("operator", operator);
       parameters.add("isEmergencyPublish", String.valueOf(isEmergencyPublish));
       HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<>(parameters, headers);
-      ReleaseDTO response = restTemplate.post(env,
+      return restTemplate.post(env,
           "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases", entity,
           ReleaseDTO.class, appId, clusterName, namespace);
-      return response;
     }
 
     public ReleaseDTO createGrayDeletionRelease(String appId, Env env, String clusterName,
@@ -409,10 +407,9 @@ public ReleaseDTO createGrayDeletionRelease(String appId, Env env, String cluste
       parameters.add("isEmergencyPublish", String.valueOf(isEmergencyPublish));
       grayDelKeys.forEach(key -> parameters.add("grayDelKeys", key));
       HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<>(parameters, headers);
-      ReleaseDTO response = restTemplate.post(env,
+      return restTemplate.post(env,
           "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/gray-del-releases",
           entity, ReleaseDTO.class, appId, clusterName, namespace);
-      return response;
     }
 
     public ReleaseDTO updateAndPublish(String appId, Env env, String clusterName, String namespace,

apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/service/GlobalSearchServiceTest.java

@@ -40,8 +40,11 @@
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)