Merge branch 'release/6.0.3'

valtech · Jun 15, 2022 · 8b184b0 · 8b184b0
2 parents 7b97ad9 + c17933e
commit 8b184b0
Show file tree

Hide file tree

Showing 35 changed files with 154 additions and 60 deletions.
diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
@@ -0,0 +1,8 @@
+name: "AECU CodeQL config"
+
+queries:
+  - uses: security-and-quality
+
+paths-ignore:
+  - '**/ui.apps.groovyconsole/**/*.*'
+  - '**/target/**/*.*'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -35,13 +35,21 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
+
+    - name: Cache Maven packages
+      uses: actions/cache@v1
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
+        config-file: ./.github/codeql/codeql-config.yml
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
@@ -63,4 +71,4 @@ jobs:
        mvn clean install
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -0,0 +1,48 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: maven
+
+    - name: Cache SonarCloud packages
+      uses: actions/cache@v1
+      with:
+        path: ~/.sonar/cache
+        key: ${{ runner.os }}-sonar
+        restore-keys: ${{ runner.os }}-sonar
+
+    - name: Cache Maven packages
+      uses: actions/cache@v1
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+
+    - name: Build with Maven
+      run: mvn clean install javadoc:javadoc
+
+    - name: Build and analyze
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=aecu
diff --git a/.travis.yml b/.travis.yml
diff --git a/HISTORY b/HISTORY
@@ -1,3 +1,6 @@
+6.0.3
+  - Improvements to cloud startup hook (190)
+
 2022-06-03 6.0.2
   - Improvements to cloud startup hook to avoid double execution and execution before Groovy Console is ready
 

diff --git a/api/pom.xml b/api/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
     </parent>
 
     <artifactId>aecu.api</artifactId>
@@ -45,6 +45,36 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                  <execution>
+                    <id>prepare-agent</id>
+                    <goals>
+                      <goal>prepare-agent</goal>
+                    </goals>
+                  </execution>
+                  <execution>
+                    <id>report</id>
+                    <phase>prepare-package</phase>
+                    <goals>
+                      <goal>report</goal>
+                    </goals>
+                  </execution>
+                  <execution>
+                    <id>post-unit-test</id>
+                    <phase>test</phase>
+                    <goals>
+                      <goal>report</goal>
+                    </goals>
+                  </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+            </plugin>            
         </plugins>
     </build>
 

diff --git a/api/src/test/java/de/valtech/aecu/core/groovy/console/bindings/filters/TestFilters.java b/api/src/test/java/de/valtech/aecu/core/groovy/console/bindings/filters/TestFilters.java
@@ -159,7 +159,7 @@ public void filter_whenMultiValueFieldMatch_thenTrue() {
 
         Map<String, Object> properties_multiValue_same_int = new HashMap<>();
         properties_multiValue_same_int.put("testMultiValueInt", new Integer[] {1, 2, 3});
-        assertTrue(new FilterByProperties(properties_multiValue_same).filter(resource, new StringBuilder()));
+        assertTrue(new FilterByProperties(properties_multiValue_same_int).filter(resource, new StringBuilder()));
 
         Map<String, Object> properties_multiValue_2 = new HashMap<>();
         properties_multiValue_2.put("testMultiValue", new String[] {"val_1", "val_2"});

diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
     </parent>
 
     <artifactId>aecu.cloud.startup.hook</artifactId>

diff --git a/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/AecuCloudStartupService.java b/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/AecuCloudStartupService.java
@@ -58,8 +58,8 @@ public class AecuCloudStartupService {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AecuCloudStartupService.class);
 
-    private static final int WAIT_PERIOD = 10;
-    private static final int WAIT_INTERVALS = 30;
+    private static final int WAIT_PERIOD = 30;
+    private static final int WAIT_INTERVALS = 10;
     // migration timeout in seconds
     private static final int MIGRATION_TIMEOUT = 1800;
 
@@ -71,7 +71,16 @@ public class AecuCloudStartupService {
     private ServiceComponentRuntime serviceComponentRuntime;
 
     @Activate
-    public void checkAndRunMigration() {
+    public void activate() {
+        Runnable runnable = this::checkAndRunMigration;
+        Thread thread = new Thread(runnable);
+        thread.start();
+    }
+
+    /**
+     * Checks if the components are ready and starts the migration process.
+     */
+    protected void checkAndRunMigration() {
         ResourceResolver resourceResolver = getResourceResolver();
         Session session = resourceResolver.adaptTo(Session.class);
         boolean isCompositeNodeStore = RuntimeHelper.isCompositeNodeStore(session);
@@ -81,7 +90,7 @@ public void checkAndRunMigration() {
                     LOGGER.error("Groovy extension services seem to be not bound");
                     throw new IllegalStateException("Groovy extension services seem to be not bound");
                 }
-                Thread.sleep(1000L * WAIT_PERIOD);
+                Thread.sleep(1000L * WAIT_PERIOD * 2);
                 startAecuMigration();
             } catch (InterruptedException e) {
                 LOGGER.error("Interrupted", e);

diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
     </parent>
 
     <artifactId>aecu.complete.cloud</artifactId>

diff --git a/...e.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config b/...e.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config
@@ -1 +1 @@
-user.mapping=["de.valtech.aecu.core:aecu-admin\=aecu-admin"]
+user.mapping=["de.valtech.aecu.core:aecu-admin\=[aecu-admin]"]
diff --git a/...viceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUserStartupHook.config b/...viceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUserStartupHook.config
@@ -1 +1 @@
-user.mapping=["de.valtech.aecu.cloud.startup.hook:aecu-admin\=aecu-admin"]
+user.mapping=["de.valtech.aecu.cloud.startup.hook:aecu-admin\=[aecu-admin]"]
diff --git a/...rviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuContentMigratorUser.config b/...rviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuContentMigratorUser.config
@@ -1 +1 @@
-user.mapping=["de.valtech.aecu.core:aecu-content-migrator\=aecu-content-migrator"]
+user.mapping=["de.valtech.aecu.core:aecu-content-migrator\=[aecu-content-migrator]"]
diff --git a/....sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config b/....sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config
@@ -1 +1 @@
-user.mapping=["de.valtech.aecu.core:aecu\=aecu-service"]
+user.mapping=["de.valtech.aecu.core:aecu\=[aecu-service]"]
diff --git a/complete/pom.xml b/complete/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
     </parent>
 
     <artifactId>aecu.complete</artifactId>

diff --git a/...e.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config b/...e.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config
@@ -1 +1 @@
-user.mapping=["de.valtech.aecu.core:aecu-admin\=aecu-admin"]
+user.mapping=["de.valtech.aecu.core:aecu-admin\=[aecu-admin]"]
diff --git a/...rviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuContentMigratorUser.config b/...rviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuContentMigratorUser.config
@@ -1 +1 @@
-user.mapping=["de.valtech.aecu.core:aecu-content-migrator\=aecu-content-migrator"]
+user.mapping=["de.valtech.aecu.core:aecu-content-migrator\=[aecu-content-migrator]"]
diff --git a/....sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config b/....sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config
@@ -1 +1 @@
-user.mapping=["de.valtech.aecu.core:aecu\=aecu-service"]
+user.mapping=["de.valtech.aecu.core:aecu\=[aecu-service]"]
diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
     </parent>
 
     <artifactId>aecu.core</artifactId>

diff --git a/...ain/java/de/valtech/aecu/core/groovy/console/bindings/actions/page/SetPageTagsAction.java b/...ain/java/de/valtech/aecu/core/groovy/console/bindings/actions/page/SetPageTagsAction.java
@@ -71,7 +71,6 @@ public String doAction(Resource resource) throws PersistenceException {
     /**
      * Returns the tags that need to be added.
      * 
-     * @param oldTags list of existing tags
      * @return tags to add
      * @throws PersistenceException invalid tag found
      */

diff --git a/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/impl/ContentUpgradeImpl.java b/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/impl/ContentUpgradeImpl.java
@@ -165,7 +165,7 @@ public ContentUpgrade forResourcesByPropertyQuery(@Nonnull String path, Map<Stri
         if (properties != null) {
             properties.forEach((key, value) -> {
                 if (key == null || value == null) {
-                    LOG.warn("Null key or value provided: Key: " + key + " Value: " + value);
+                    LOG.warn("Null key or value provided: Key: {} Value: {}", key, value);
                     return;
                 }
                 if (value.contains("%")) {

diff --git a/core/src/main/java/de/valtech/aecu/core/history/HistoryUtil.java b/core/src/main/java/de/valtech/aecu/core/history/HistoryUtil.java
@@ -418,7 +418,7 @@ public void purgeHistory(ResourceResolver resolver, int daysToKeep) throws Persi
         Resource base = resolver.getResource(HISTORY_BASE);
         Calendar calendar = new GregorianCalendar();
         calendar.add(Calendar.DAY_OF_MONTH, -daysToKeep);
-        LOG.debug("Starting purge with limit " + calendar.getTime().toString());
+        LOG.debug("Starting purge with limit {}", calendar.getTime());
         deleteRecursive(base.listChildren(), calendar, new int[] {Calendar.YEAR, Calendar.MONTH, Calendar.DAY_OF_MONTH});
     }
 
@@ -437,7 +437,7 @@ private void deleteRecursive(Iterator<Resource> resources, Calendar calendar, in
             String name = resource.getName();
             // skip extra nodes such as ACLs
             if (!StringUtils.isNumeric(name)) {
-                LOG.debug("Skipping purge of other node: " + resource.getPath());
+                LOG.debug("Skipping purge of other node: {}", resource.getPath());
                 continue;
             }
             int nodeValue = Integer.parseInt(name);
@@ -447,9 +447,9 @@ private void deleteRecursive(Iterator<Resource> resources, Calendar calendar, in
                 limit++;
             }
             if (nodeValue > limit) {
-                LOG.debug("Skipping purge of too young node: " + resource.getPath());
+                LOG.debug("Skipping purge of too young node: {}", resource.getPath());
             } else if (nodeValue == limit) {
-                LOG.debug("Skipping purge of too young node: " + resource.getPath());
+                LOG.debug("Skipping purge of too young node: {}", resource.getPath());
                 // check next level
                 if (fields.length == 1) {
                     return;
@@ -458,7 +458,7 @@ private void deleteRecursive(Iterator<Resource> resources, Calendar calendar, in
                 System.arraycopy(fields, 1, fieldsNew, 0, fieldsNew.length);
                 deleteRecursive(resource.listChildren(), calendar, fieldsNew);
             } else {
-                LOG.debug("Purging node: " + resource.getPath());
+                LOG.debug("Purging node: {}", resource.getPath());
                 BatchResourceRemover remover = ResourceUtil.getBatchResourceRemover(1000);
                 remover.delete(resource);
             }

diff --git a/core/src/main/java/de/valtech/aecu/core/installhook/AecuTrackerListener.java b/core/src/main/java/de/valtech/aecu/core/installhook/AecuTrackerListener.java
@@ -108,7 +108,7 @@ public void onMessage(Mode mode, String action, String path) {
         }
 
         if (!ACTIONS.contains(action) && isValid(path)) {
-            LOG.debug(String.format("Skipping %s due to non matching action '%s'", path, action));
+            LOG.debug("Skipping {} due to non matching action '{}'", path, action);
             return;
         }
 

diff --git a/core/src/main/java/de/valtech/aecu/core/model/execute/ExecuteDataSource.java b/core/src/main/java/de/valtech/aecu/core/model/execute/ExecuteDataSource.java
@@ -73,7 +73,7 @@ public void setup() throws AecuException {
             List<String> allowedScripts = aecuService.getFiles(path);
             ResourceResolver resourceResolver = request.getResourceResolver();
             for (String scriptPath : allowedScripts) {
-                entries.add(new ValueMapResource(resourceResolver, scriptPath, ITEM_TYPE, null));
+                entries.add(new ValueMapResource(resourceResolver, scriptPath, ITEM_TYPE));
             }
         }
 

diff --git a/core/src/main/java/de/valtech/aecu/core/security/AccessValidationService.java b/core/src/main/java/de/valtech/aecu/core/security/AccessValidationService.java
@@ -116,7 +116,7 @@ private String getUserName(SlingHttpServletRequest request) {
     /**
      * Returns the AEM groups that belong to the user.
      * 
-     * @param user user
+     * @param request request
      * @return group names
      */
     private List<String> getUserGroupNames(SlingHttpServletRequest request) {

diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
     </parent>
 
     <artifactId>aecu.examples-cloud</artifactId>

diff --git a/...les-cloud/src/main/content/jcr_root/apps/aecu-scripts/aecu-examples/1_start.always.groovy b/...les-cloud/src/main/content/jcr_root/apps/aecu-scripts/aecu-examples/1_start.always.groovy
@@ -1 +1,6 @@
-println "AECU migration started"
+println "AECU migration started"
+
+aecu.contentUpgradeBuilder()
+  .forChildResourcesOf("/content/")
+  .printPath()
+  .run()
diff --git a/...ples-cloud/src/main/content/jcr_root/apps/aecu-scripts/aecu-examples/2_listContent.groovy b/...ples-cloud/src/main/content/jcr_root/apps/aecu-scripts/aecu-examples/2_listContent.groovy
@@ -1,4 +1,4 @@
 aecu.contentUpgradeBuilder()
   .forChildResourcesOf("/content/")
-  .printPath()
-  .run()
+  .printJson()
+  .run()
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
     </parent>
 
     <artifactId>aecu.examples</artifactId>