ENG-5316: upgrade java to version 17

.github/workflows/ga-publication.yml

@@ -46,7 +46,7 @@ jobs:
       - name: "Configure GA Repository"
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
           server-id: maven-central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD

.github/workflows/pr.yml

@@ -72,10 +72,10 @@ jobs:
             --token "$ENTANDO_BOT_TOKEN" \
           ;
       #~ JDK
-      - name: "Set up JDK 11"
+      - name: "Set up JDK 17"
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       #~ MAVEN CACHE
       - name: "Cache Maven packages"
         uses: actions/cache@v2
@@ -119,10 +119,10 @@ jobs:
 #          ${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
 #          ~/ppl-run checkout-branch pr --lcd "$LOCAL_CLONE_DIR"
 #      #~ JDK
-#      - name: "Set up JDK 11"
+#      - name: "Set up JDK 17"
 #        uses: actions/setup-java@v1
 #        with:
-#          java-version: 11
+#          java-version: 17
 #      #~ MAVEN CACHE
 #      - name: "Cache Maven packages"
 #        id: maven-cache

.github/workflows/publication.yml

@@ -10,15 +10,15 @@ env:
   ENTANDO_BOT_TOKEN: ${{ secrets.ENTANDO_BOT_TOKEN }}
   PR_CHECKER_PATH: ".github/pr-title-checker-config.json"
 
-  JDK_VERSION: 11
+  JDK_VERSION: 17
   BUILD_COMMANDS: mvn clean install;
-  DOCKER_EAP_IMAGE_BASE_NAME: entando/entando-de-app-eap
+#  DOCKER_EAP_IMAGE_BASE_NAME: entando/entando-de-app-eap
   DOCKER_TOMCAT_IMAGE_BASE_NAME: entando/entando-de-app-tomcat
-  DOCKER_WILDFLY_IMAGE_BASE_NAME: entando/entando-de-app-wildfly
+#  DOCKER_WILDFLY_IMAGE_BASE_NAME: entando/entando-de-app-wildfly
   DOCKER_EAP-WILDFLY_IMAGE_ARCHITECTURE: linux/amd64
   DOCKER_TOMCAT_IMAGE_ARCHITECTURE: linux/amd64,linux/arm64
   DOCKER_IMAGE_CONTEXT: .
-  DOCKER_EAP_IMAGE_FILE: Dockerfile.eap
+#  DOCKER_EAP_IMAGE_FILE: Dockerfile.eap
   DOCKER_TOMCAT_IMAGE_FILE: Dockerfile.tomcat
   DOCKER_WILDFLY_IMAGE_FILE: Dockerfile.wildfly
   DOCKER_IMAGE_PUSH: true
@@ -58,22 +58,22 @@ jobs:
       - name: Build with Maven
         run: ${{ env.BUILD_COMMANDS }}
 
-      - name: Docker meta-eap
-        id: meta-eap
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.DOCKER_EAP_IMAGE_BASE_NAME }}
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr,value={{base_ref}}
-            type=ref,event=tag
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-            type=raw,event=pr,value={{base_ref}}
+#      - name: Docker meta-eap
+#        id: meta-eap
+#        uses: docker/metadata-action@v4
+#        with:
+#          images: |
+#            ${{ env.DOCKER_EAP_IMAGE_BASE_NAME }}
+#          tags: |
+#            type=schedule
+#            type=ref,event=branch
+#            type=ref,event=pr,value={{base_ref}}
+#            type=ref,event=tag
+#            type=semver,pattern={{version}}
+#            type=semver,pattern={{major}}.{{minor}}
+#            type=semver,pattern={{major}}
+#            type=sha
+#            type=raw,event=pr,value={{base_ref}}
 
       - name: Docker meta-tomcat
         id: meta-tomcat
@@ -92,22 +92,22 @@ jobs:
             type=sha
             type=raw,event=pr,value={{base_ref}}
 
-      - name: Docker meta-wildfly
-        id: meta-wildfly
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.DOCKER_WILDFLY_IMAGE_BASE_NAME }}
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr,value={{base_ref}}
-            type=ref,event=tag
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-            type=raw,event=pr,value={{base_ref}}
+#      - name: Docker meta-wildfly
+#        id: meta-wildfly
+#        uses: docker/metadata-action@v4
+#        with:
+#          images: |
+#            ${{ env.DOCKER_WILDFLY_IMAGE_BASE_NAME }}
+#          tags: |
+#            type=schedule
+#            type=ref,event=branch
+#            type=ref,event=pr,value={{base_ref}}
+#            type=ref,event=tag
+#            type=semver,pattern={{version}}
+#            type=semver,pattern={{major}}.{{minor}}
+#            type=semver,pattern={{major}}
+#            type=sha
+#            type=raw,event=pr,value={{base_ref}}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -130,15 +130,15 @@ jobs:
           username: ${{ secrets.ENTANDO_RHT_DOCKER_USERNAME }}
           password: ${{ secrets.ENTANDO_RHT_DOCKER_PASSWORD }}
 
-      - name: Build and push eap Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: ${{ env.DOCKER_IMAGE_CONTEXT }}
-          file: ${{ env.DOCKER_EAP_IMAGE_FILE }}
-          push: ${{ env.DOCKER_IMAGE_PUSH }}
-          tags: ${{ steps.meta-eap.outputs.tags }}
-          labels: ${{ steps.meta-eap.outputs.labels }}
-          platforms: ${{ env.DOCKER_EAP-WILDFLY_IMAGE_ARCHITECTURE }}
+#      - name: Build and push eap Docker image
+#        uses: docker/build-push-action@v4
+#        with:
+#          context: ${{ env.DOCKER_IMAGE_CONTEXT }}
+#          file: ${{ env.DOCKER_EAP_IMAGE_FILE }}
+#          push: ${{ env.DOCKER_IMAGE_PUSH }}
+#          tags: ${{ steps.meta-eap.outputs.tags }}
+#          labels: ${{ steps.meta-eap.outputs.labels }}
+#          platforms: ${{ env.DOCKER_EAP-WILDFLY_IMAGE_ARCHITECTURE }}
 
       - name: Build tomcat Docker image for amd64
         uses: docker/build-push-action@v4
@@ -170,12 +170,12 @@ jobs:
           labels: ${{ steps.meta-tomcat.outputs.labels }}
           platforms: ${{ env.DOCKER_TOMCAT_IMAGE_ARCHITECTURE }}
 
-      - name: Build and push wildfly Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: ${{ env.DOCKER_IMAGE_CONTEXT }}
-          file: ${{ env.DOCKER_WILDFLY_IMAGE_FILE }}
-          push: ${{ env.DOCKER_IMAGE_PUSH }}
-          tags: ${{ steps.meta-wildfly.outputs.tags }}
-          labels: ${{ steps.meta-wildfly.outputs.labels }}
-          platforms: ${{ env.DOCKER_EAP-WILDFLY_IMAGE_ARCHITECTURE }}
+#      - name: Build and push wildfly Docker image
+#        uses: docker/build-push-action@v4
+#        with:
+#          context: ${{ env.DOCKER_IMAGE_CONTEXT }}
+#          file: ${{ env.DOCKER_WILDFLY_IMAGE_FILE }}
+#          push: ${{ env.DOCKER_IMAGE_PUSH }}
+#          tags: ${{ steps.meta-wildfly.outputs.tags }}
+#          labels: ${{ steps.meta-wildfly.outputs.labels }}
+#          platforms: ${{ env.DOCKER_EAP-WILDFLY_IMAGE_ARCHITECTURE }}

Dockerfile.eap

@@ -1,12 +1,12 @@
-FROM registry.hub.docker.com/entando/entando-eap73-clustered-base:7.2.0
+FROM registry.hub.docker.com/entando/entando-eap73-clustered-base:7.4.0-ENG-5316-PR-28
 ARG VERSION
 
 ### Required OpenShift Labels
 LABEL name="Entando App" \
       maintainer="dev@entando.com" \
       vendor="Entando Inc." \
       version="${VERSION}" \
-      release="7.0.0" \
+      release="7.4.0" \
       summary="Entando Application" \
       description="This Entando app engine application provides APIs and composition for Entando applications"
 

Dockerfile.tomcat

@@ -1,12 +1,12 @@
-FROM registry.hub.docker.com/entando/entando-tomcat-base:7.2.0-IT-410-PR-26
+FROM registry.hub.docker.com/entando/entando-tomcat-base:7.4.0-ENG-5316-PR-28
 ARG VERSION
 
 ### Required OpenShift Labels
 LABEL name="Entando App" \
       maintainer="dev@entando.com" \
       vendor="Entando Inc." \
       version="${VERSION}" \
-      release="7.0.0" \
+      release="7.4.0" \
       summary="Entando Application" \
       description="This Entando app engine application provides APIs and composition for Entando applications"
 

Dockerfile.wildfly

@@ -1,4 +1,4 @@
-FROM registry.hub.docker.com/entando/entando-wildfly17-base:7.2.0
+FROM registry.hub.docker.com/entando/entando-wildfly17-base:7.4.0-ENG-5316-PR-28
 
 ARG VERSION
 
@@ -7,7 +7,7 @@ LABEL name="Entando App" \
       maintainer="dev@entando.com" \
       vendor="Entando Inc." \
       version="${VERSION}" \
-      release="7.0.0" \
+      release="7.4.0" \
       summary="Entando Application" \
       description="This Entando app engine application provides APIs and composition for Entando applications"
 

admin-console/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.entando</groupId>
         <artifactId>app-engine</artifactId>
-        <version>7.3.0-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
     <groupId>org.entando.entando</groupId>
     <artifactId>entando-admin-console</artifactId>

admin-console/src/main/java/com/agiletec/apsadmin/system/BaseAction.java

@@ -219,7 +219,7 @@ protected ITreeNodeManager getTreeNodeManager(ITreeNode treeNode) {
     }
 
     public TenantConfig getCurrentTenantConfig() {
-        return ApsTenantApplicationUtils.getTenant().flatMap(getTenantManager()::getConfig).orElse(null);
+        return ApsTenantApplicationUtils.getTenant().flatMap(getTenantManager()::getConfigOfReadyTenant).orElse(null);
     }
 
 	@Override

admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/common/inc/pagerInfo.jsp

@@ -1,4 +1,4 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="wp" uri="/aps-core" %>
 <span><s:text name="note.searchIntro" />&#32;<s:property value="#group.size" />&#32;<s:text name="note.searchOutro" /> |
-    <s:text name="label.page" /> <s:property value="#group.currItem" /> - <s:property value="#group.maxItem" /></span>
+    <s:text name="label.page" />&#32;<s:property value="#group.currItem" /> - <s:property value="#group.maxItem" /></span>

admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/common/tiles-inserts/header.jsp

@@ -17,6 +17,17 @@
 <script>
     jQuery(function () {
         $('#activity-stream [data-toggle="tooltip"]').tooltip({trigger: 'hover'});
+        <s:set var="appBuilderIntegrationEnabled" ><wp:info key="systemParam" paramName="appBuilderIntegrationEnabled" /></s:set>
+		<s:if test="#appBuilderIntegrationEnabled == 'true'">
+        // trigger updateLocale if language is changed
+        $('#languageDropdownComponent a').click(function(e) {
+            e.preventDefault();
+            if (updateLocalStorageWithLocale) {
+                updateLocalStorageWithLocale($(this).data('locale'));
+            }
+            window.location.href = $(this).attr('href');
+        });
+        </s:if>
     })
 </script>
 

admin-console/src/test/java/com/agiletec/apsadmin/system/BaseActionTest.java

@@ -47,19 +47,19 @@ void shouldCurrentTenantWorkFine() {
             apsTenantApplicationUtils.reset();
             Mockito.reset(tenantManager);
             apsTenantApplicationUtils.when(() -> ApsTenantApplicationUtils.getTenant()).thenReturn(Optional.of("tenantx"));
-            Mockito.when(tenantManager.getConfig("tenantx")).thenReturn(Optional.empty());
+            Mockito.when(tenantManager.getConfigOfReadyTenant("tenantx")).thenReturn(Optional.empty());
             config = this.baseAction.getCurrentTenantConfig();
             Assertions.assertNull(config);
-            Mockito.verify(tenantManager, Mockito.times(1)).getConfig("tenantx");
+            Mockito.verify(tenantManager, Mockito.times(1)).getConfigOfReadyTenant("tenantx");
 
             apsTenantApplicationUtils.reset();
             Mockito.reset(tenantManager);
             apsTenantApplicationUtils.when(() -> ApsTenantApplicationUtils.getTenant()).thenReturn(Optional.of("tenanty"));
             TenantConfig tc = new TenantConfig(Map.of("tenantCode","tenanty"));
-            Mockito.when(tenantManager.getConfig("tenanty")).thenReturn(Optional.of(tc));
+            Mockito.when(tenantManager.getConfigOfReadyTenant("tenanty")).thenReturn(Optional.of(tc));
             config = this.baseAction.getCurrentTenantConfig();
             Assertions.assertNotNull(config);
-            Mockito.verify(tenantManager, Mockito.times(1)).getConfig("tenanty");
+            Mockito.verify(tenantManager, Mockito.times(1)).getConfigOfReadyTenant("tenanty");
         }
     }
 

cds-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.entando</groupId>
         <artifactId>app-engine</artifactId>
-        <version>7.3.0-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>entando-plugin-jpcds</artifactId>
     <groupId>org.entando.entando.plugins</groupId>

cds-plugin/src/main/java/org/entando/entando/plugins/jpcds/aps/system/storage/CdsStorageManager.java

@@ -33,6 +33,7 @@
 import org.entando.entando.aps.system.services.tenants.TenantConfig;
 import org.entando.entando.aps.util.UrlUtils.EntUrlBuilder;
 import org.entando.entando.ent.exception.EntException;
+import org.entando.entando.ent.exception.EntResourceNotFoundException;
 import org.entando.entando.ent.exception.EntRuntimeException;
 import org.entando.entando.plugins.jpcds.aps.system.storage.CdsUrlUtils.EntSubPath;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -159,9 +160,9 @@ public InputStream getStream(String subPath, boolean isProtectedResource) throws
                 log.info("File Not found - uri {}", url);
                 return null;
             }  
-            throw new EntException(ERROR_EXTRACTING_FILE, e);
+            throw new EntResourceNotFoundException(ERROR_EXTRACTING_FILE, e);
         } catch (Exception e) {
-            throw new EntException(ERROR_EXTRACTING_FILE, e);
+            throw new EntResourceNotFoundException(ERROR_EXTRACTING_FILE, e);
         }
     }
 

cms-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.entando</groupId>
         <artifactId>app-engine</artifactId>
-        <version>7.3.0-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
     <groupId>org.entando.entando.plugins</groupId>
     <artifactId>entando-plugin-jacms</artifactId>

cms-plugin/src/main/java/com/agiletec/plugins/jacms/aps/system/services/content/ContentManager.java

@@ -14,7 +14,6 @@
 package com.agiletec.plugins.jacms.aps.system.services.content;
 
 import com.agiletec.aps.system.ApsSystemUtils;
-import com.agiletec.aps.system.SystemConstants;
 import com.agiletec.aps.system.common.entity.ApsEntityManager;
 import com.agiletec.aps.system.common.entity.IEntityDAO;
 import com.agiletec.aps.system.common.entity.IEntitySearcherDAO;
@@ -53,8 +52,9 @@
  * Contents manager. This implements all the methods needed to create and manage
  * the contents.
  */
-public class ContentManager extends ApsEntityManager
-                            implements IContentManager, GroupUtilizer<String>, PageUtilizer, ContentUtilizer, ResourceUtilizer, CategoryUtilizer {
+public class ContentManager extends ApsEntityManager 
+        implements IContentManager, GroupUtilizer<String>, PageUtilizer, 
+        ContentUtilizer<String>, ResourceUtilizer<String>, CategoryUtilizer<String, String> {
 
     private static final EntLogger logger = EntLogFactory.getSanitizedLogger(ContentManager.class);
 
@@ -615,7 +615,7 @@ public List getPageUtilizers(String pageCode) throws EntException {
     }
 
     @Override
-    public List getContentUtilizers(String contentId) throws EntException {
+    public List<String> getContentUtilizers(String contentId) throws EntException {
         try {
             return this.getContentDAO().getContentUtilizers(contentId);
         } catch (Throwable t) {
@@ -633,7 +633,7 @@ public List<String> getGroupUtilizers(String groupName) throws EntException {
     }
 
     @Override
-    public List getResourceUtilizers(String resourceId) throws EntException {
+    public List<String> getResourceUtilizers(String resourceId) throws EntException {
         try {
             return this.getContentDAO().getResourceUtilizers(resourceId);
         } catch (Throwable t) {
@@ -642,7 +642,7 @@ public List getResourceUtilizers(String resourceId) throws EntException {
     }
 
     @Override
-    public List getCategoryUtilizers(String resourceId) throws EntException {
+    public List<String> getCategoryUtilizers(String resourceId) throws EntException {
         try {
             return this.getContentDAO().getCategoryUtilizers(resourceId);
         } catch (Throwable t) {
@@ -661,7 +661,7 @@ public void reloadCategoryReferences(String categoryCode) {
 
     @SuppressWarnings("rawtypes")
     @Override
-    public List getCategoryUtilizersForReloadReferences(String categoryCode) {
+    public List<String> getCategoryUtilizersForReloadReferences(String categoryCode) {
         List<String> contentIdToReload = new ArrayList<>();
         try {
             Set<String> contents = this.getContentUpdaterService().getContentsId(categoryCode);