Merge branch 'master' into master

Author: tacklequestions

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,4 +15,5 @@ Follow this checklist to help us incorporate your contribution quickly and easil
 - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
 - [ ] Write necessary unit tests to verify the code.
 - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
+- [ ] Run `mvn spotless:apply` to format your code.
 - [ ] Update the [`CHANGES` log](https://github.com/apolloconfig/apollo/blob/master/CHANGES.md).

.github/workflows/code-style-check.yml

@@ -0,0 +1,45 @@
+#
+# Copyright 2025 Apollo Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This workflow checks code style using Spotless
+
+name: code style check
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  code-style-check:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v1
+      with:
+        java-version: 17
+    - name: Cache Maven packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Code Style Check
+      run: mvn spotless:check

CHANGES.md

@@ -21,5 +21,6 @@ Apollo 2.5.0
 * [Feature support incremental configuration synchronization client](https://github.com/apolloconfig/apollo/pull/5288)
 * [optimize: Implement unified permission verification logic and Optimize the implementation of permission verification](https://github.com/apolloconfig/apollo/pull/5456)
 * [CI: Add code and header formatter by spotless plugin](https://github.com/apolloconfig/apollo/pull/5485)
+* [Fix: Operate the AccessKey multiple times within one second](https://github.com/apolloconfig/apollo/pull/5490)
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/16?closed=1)

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/main/java/com/ctrip/framework/apollo/biz/repository/AccessKeyRepository.java

@@ -33,5 +33,8 @@ public interface AccessKeyRepository extends PagingAndSortingRepository<AccessKe
   List<AccessKey> findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(
       Date date);
 
+  List<AccessKey> findFirst500ByDataChangeLastModifiedTimeGreaterThanEqualAndDataChangeLastModifiedTimeLessThanOrderByDataChangeLastModifiedTimeAsc(
+      Date start, Date end);
+
   List<AccessKey> findByDataChangeLastModifiedTime(Date date);
 }

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-biz/src/test/java/com/ctrip/framework/apollo/biz/repository/AccessKeyRepositoryTest.java

@@ -84,4 +84,25 @@ public void testFindFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataCh
     assertThat(accessKeyList.get(1).getSecret()).isEqualTo("c715cbc80fc44171b43732c3119c9456");
   }
 
+  @Test
+  @Sql(scripts = "/sql/accesskey-test.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
+  @Sql(scripts = "/sql/clean.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
+  public void testFindFirst500ByDataChangeLastModifiedTimeGreaterThanEqualAndDataChangeLastModifiedTimeLessThanOrderByDataChangeLastModifiedTime() {
+    Instant instantStart =
+        LocalDateTime.of(2019, 12, 19, 13, 44, 21).atZone(ZoneId.systemDefault()).toInstant();
+    Date dateStart = Date.from(instantStart);
+
+    Instant instantEnd =
+        LocalDateTime.of(2019, 12, 19, 13, 44, 22).atZone(ZoneId.systemDefault()).toInstant();
+    Date dateEnd = Date.from(instantEnd);
+
+
+    List<AccessKey> accessKeyList = accessKeyRepository
+        .findFirst500ByDataChangeLastModifiedTimeGreaterThanEqualAndDataChangeLastModifiedTimeLessThanOrderByDataChangeLastModifiedTimeAsc(
+            dateStart, dateEnd);
+
+    assertThat(accessKeyList).hasSize(1);
+    assertThat(accessKeyList.get(0).getAppId()).isEqualTo("100004458");
+    assertThat(accessKeyList.get(0).getSecret()).isEqualTo("4003c4d7783443dc9870932bebf3b7fe");
+  }
 }