ENG-5316: Upgrade java to version 17

Author: eugeniosant

.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,7 +10,7 @@ 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_TOMCAT_IMAGE_BASE_NAME: entando/entando-de-app-tomcat

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>

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>

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, ResourceUtilizer<String>, CategoryUtilizer<String, String> {
 
     private static final EntLogger logger = EntLogFactory.getSanitizedLogger(ContentManager.class);
 
@@ -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);

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

@@ -20,8 +20,9 @@
 /**
  * Basic interface for the services whose handled elements may have references to contents. 
  * @author E.Santoboni
+ * @param <T>
  */
-public interface ContentUtilizer {
+public interface ContentUtilizer<T> {
 
 	/**
 	 * Return the ID of the utilizer service.
@@ -35,6 +36,6 @@ public interface ContentUtilizer {
 	 * @return the list of the objects which reference the content. 
 	 * @throws EntException in case of error.
 	 */
-	public List getContentUtilizers(String contentId) throws EntException;
+	public List<T> getContentUtilizers(String contentId) throws EntException;
 
 }

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

@@ -294,6 +294,7 @@ private void fillAbstractResourceAttribute(AttributeInterface attribute, EntityA
         if (AbstractResourceAttribute.class.isAssignableFrom(attribute.getClass())) {
             AbstractResourceAttribute resourceAttribute = (AbstractResourceAttribute) attribute;
             for (Entry<String, Object> resourceEntry : attributeDto.getValues().entrySet()) {
+                @SuppressWarnings("unchecked")
                 Map<String, Object> resourceMap = (Map<String, Object>) resourceEntry.getValue();
                 this.setResourceAttribute(resourceAttribute, resourceMap, resourceEntry.getKey());
             }
@@ -312,6 +313,7 @@ private void setResourceAttribute(AbstractResourceAttribute resourceAttribute, M
         resourceInterface.setId(resourceId);
         resourceInterface.setCorrelationCode(correlationCode);
         resourceAttribute.setResource(resourceInterface, langCode);
+        @SuppressWarnings("unchecked")
         Map<String, Object> values = (Map<String, Object>) resource.get("metadata");
         if (values != null) {
             Map<String, String> metadata = values.entrySet().stream()

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

@@ -243,7 +243,7 @@ public EntitySearchFilter getEntityFilter() throws EntException {
 			AttributeInterface attribute = this.getAttribute();
 			if (attribute instanceof ITextAttribute) {
 				String text = this.getFormFieldValues().get(this.getFormFieldNames()[0]);
-				filter = new EntitySearchFilter(attribute.getName(), true, text, true);
+				filter = new EntitySearchFilter<String>(attribute.getName(), true, text, true);
 				if (attribute.isMultilingual()) {
 					filter.setLangCode(this.getCurrentLang().getCode());
 				}
@@ -252,7 +252,7 @@ public EntitySearchFilter getEntityFilter() throws EntException {
 				String end = this.getFormFieldValues().get(this.getFormFieldNames()[1]);
 				Date startDate = DateConverter.parseDate(start, this.getDateFormat());
 				Date endDate = DateConverter.parseDate(end, this.getDateFormat());
-				filter = new EntitySearchFilter(attribute.getName(), true, startDate, endDate);
+				filter = new EntitySearchFilter<Date>(attribute.getName(), true, startDate, endDate);
 			} else if (attribute instanceof BooleanAttribute) {
 				String value = this.getFormFieldValues().get(this.getFormFieldNames()[0]);
 				String ignore = this.getFormFieldValues().get(this.getFormFieldNames()[1]);
@@ -263,7 +263,7 @@ public EntitySearchFilter getEntityFilter() throws EntException {
 					filter = new EntitySearchFilter(attribute.getName(), true);
 					filter.setNullOption(true);
 				} else {
-					filter = new EntitySearchFilter(attribute.getName(), true, value, false);
+					filter = new EntitySearchFilter<String>(attribute.getName(), true, value, false);
 				}
 			} else if (attribute instanceof NumberAttribute) {
 				String start = this.getFormFieldValues().get(this.getFormFieldNames()[0]);
@@ -278,7 +278,7 @@ public EntitySearchFilter getEntityFilter() throws EntException {
 					Integer endNumberInt = Integer.parseInt(end);
 					endNumber = new BigDecimal(endNumberInt);
 				} catch (Throwable t) {}
-				filter = new EntitySearchFilter(attribute.getName(), true, startNumber, endNumber);
+				filter = new EntitySearchFilter<BigDecimal>(attribute.getName(), true, startNumber, endNumber);
 			}
 		} catch (Throwable t) {
 			_logger.error("Error extracting entity search filters", t);
@@ -308,14 +308,14 @@ public SearchEngineFilter extractFilter() {
 		if (!this.isAttributeFilter()) {
 			if (this.getKey().equals(KEY_FULLTEXT) && !StringUtils.isEmpty(value0)) {
 				//String[] fieldsSuffix = {"", "_option"};
-				filter = new SearchEngineFilter(this.getCurrentLang().getCode(), value0, this.getOption(value1));
+				filter = new SearchEngineFilter<>(this.getCurrentLang().getCode(), value0, this.getOption(value1));
 			} else if (this.getKey().equals(KEY_CATEGORY) && !StringUtils.isEmpty(value0)) {
-				filter = new SearchEngineFilter(IIndexerDAO.CONTENT_CATEGORY_FIELD_NAME, value0, SearchEngineFilter.TextSearchOption.EXACT);
+				filter = new SearchEngineFilter<>(IIndexerDAO.CONTENT_CATEGORY_FIELD_NAME, value0, SearchEngineFilter.TextSearchOption.EXACT);
 			}
 		} else {
 			AttributeInterface attribute = this.getAttribute();
 			if (attribute instanceof ITextAttribute && !StringUtils.isEmpty(value0)) {
-				filter = new SearchEngineFilter(this.getIndexFieldName(), value0, SearchEngineFilter.TextSearchOption.EXACT);
+				filter = new SearchEngineFilter<>(this.getIndexFieldName(), value0, SearchEngineFilter.TextSearchOption.EXACT);
 				//String[] fieldsSuffix = {"_textFieldName"};
 			} else if (attribute instanceof DateAttribute && 
 					(!StringUtils.isEmpty(value0) || !StringUtils.isEmpty(value1))) {
@@ -328,10 +328,10 @@ public SearchEngineFilter extractFilter() {
 					big1 = DateConverter.parseDate(value1, this.getDateFormat());
 				} catch (Exception e) {}
 				//String[] fieldsSuffix = {"_dateStartFieldName", "_dateEndFieldName"};
-				filter = new SearchEngineFilter(this.getIndexFieldName(), big0, big1);
+				filter = new SearchEngineFilter<>(this.getIndexFieldName(), big0, big1);
 			} else if (attribute instanceof BooleanAttribute && 
 					(!StringUtils.isEmpty(value0) && !StringUtils.isEmpty(value1))) {
-				filter = new SearchEngineFilter(this.getIndexFieldName(), value0, SearchEngineFilter.TextSearchOption.EXACT);
+				filter = new SearchEngineFilter<>(this.getIndexFieldName(), value0, SearchEngineFilter.TextSearchOption.EXACT);
 				//String[] fieldsSuffix = {"_booleanFieldName", "_booleanFieldName_ignore", "_booleanFieldName_control"};
 			} else if (attribute instanceof NumberAttribute && 
 					(!StringUtils.isEmpty(value0) || !StringUtils.isEmpty(value1))) {
@@ -346,7 +346,7 @@ public SearchEngineFilter extractFilter() {
 					big1 = new BigDecimal(value1);
 				} catch (Exception e) {
 				}
-				filter = new SearchEngineFilter(this.getIndexFieldName(), big0, big1);
+				filter = new SearchEngineFilter<>(this.getIndexFieldName(), big0, big1);
 			}
 		}
 		return filter;