Version 6.4.3

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v6.4.3 2023-11-21
+
+* Updates to Elasticsearch 7.17.15
+* Fixes some checkstyle violations
+
 ## v6.4.1 2023-10-24
 
 * Internal: Updates deployment configuration files

Layout20-80-layouttpl/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>od-platform</artifactId>
 		<groupId>de.seitenbau.govdata.odp</groupId>
-		<version>6.4.1</version>
+		<version>6.4.3</version>
 	</parent>
 	<artifactId>Layout20-80-layouttpl</artifactId>
 	<packaging>war</packaging>

boxes-portlet/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>od-platform</artifactId>
     <groupId>de.seitenbau.govdata.odp</groupId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
   </parent>
   <artifactId>boxes-portlet</artifactId>
   <packaging>war</packaging>

categories-grid-portlet/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>od-platform</artifactId>
     <groupId>de.seitenbau.govdata.odp</groupId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
   </parent>
   <artifactId>categories-grid-portlet</artifactId>
   <packaging>war</packaging>

categories-grid-portlet/src/main/java/de/seitenbau/govdata/odp/categoriesgrid/CategoriesGrid.java

@@ -1,22 +1,3 @@
-/**
- * Copyright (c) 2012, 2013 Fraunhofer Institute FOKUS | 2017 SEITENBAU GmbH
- *
- * This file is part of Open Data Platform.
- *
- * Open Data Platform is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * Open Data Plaform is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
-
- * You should have received a copy of the GNU Affero General Public License
- * along with Open Data Platform.  If not, see <http://www.gnu.org/licenses/agpl-3.0>.
- */
-
 package de.seitenbau.govdata.odp.categoriesgrid;
 
 import static de.seitenbau.govdata.navigation.GovDataNavigation.FRIENDLY_URL_NAME_SEARCHRESULT_PAGE;

entities/entities-api/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.fhg.fokus.odp</groupId>
     <artifactId>entities</artifactId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

entities/entities-service/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.fhg.fokus.odp</groupId>
     <artifactId>entities</artifactId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

entities/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>od-platform</artifactId>
     <groupId>de.seitenbau.govdata.odp</groupId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
   </parent>
   <groupId>de.fhg.fokus.odp</groupId>
   <artifactId>entities</artifactId>

gd-blogs-service-override/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.seitenbau.govdata.odp</groupId>
     <artifactId>od-platform</artifactId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
   </parent>
   <groupId>de.seitenbau.blogs.service.override</groupId>
   <artifactId>gd-blogs-service-override</artifactId>

gd-blogs-web-override/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.seitenbau.govdata.odp</groupId>
     <artifactId>od-platform</artifactId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
   </parent>
   <groupId>de.seitenbau.blogs.web.override</groupId>
   <artifactId>gd-blogs-web-override</artifactId>

gd-captcha-api/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.seitenbau.govdata.odp</groupId>
     <artifactId>od-platform</artifactId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
   </parent>
   <groupId>de.seitenbau.govdata.gd-captcha-api</groupId>
   <artifactId>gd-captcha-api</artifactId>

gd-captcha-fragment/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>od-platform</artifactId>
     <groupId>de.seitenbau.govdata.odp</groupId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
   </parent>
 	<artifactId>gd-captcha-fragment</artifactId>
 	<properties>

gd-comment-taglib-fragment/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>od-platform</artifactId>
     <groupId>de.seitenbau.govdata.odp</groupId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
   </parent>
 	<artifactId>gd-comment-taglib-fragment</artifactId>
 	<properties>

gd-developers-corner-portlet/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>od-platform</artifactId>
     <groupId>de.seitenbau.govdata.odp</groupId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
   </parent>
   <artifactId>gd-developers-corner-portlet</artifactId>
   <packaging>war</packaging>

gd-developers-corner-portlet/src/main/java/de/seitenbau/govdata/developerscorner/DevelopersCornerController.java

@@ -1,22 +1,3 @@
-/**
- * Copyright (c) 2012, 2013 Fraunhofer Institute FOKUS | 2017 SEITENBAU GmbH
- *
- * This file is part of Open Data Platform.
- *
- * Open Data Platform is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * Open Data Plaform is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
-
- * You should have received a copy of the GNU Affero General Public License
- * along with Open Data Platform.  If not, see <http://www.gnu.org/licenses/agpl-3.0>.
- */
-
 package de.seitenbau.govdata.developerscorner;
 
 import java.util.ArrayList;

gd-edit-portlet/pom.xml

@@ -7,11 +7,12 @@
   <parent>
     <groupId>de.seitenbau.govdata.odp</groupId>
     <artifactId>od-platform</artifactId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
     <!-- <relativePath>../GovData</relativePath> -->
   </parent>
 
   <properties>
+    <checkstyle.suppressions>${basedir}/src/main/plugin-config/checkstyle-suppressions.xml</checkstyle.suppressions>
     <spotbugs.excludeFilterFile>${basedir}/src/main/plugin-config/spotbugs-exclude.xml</spotbugs.excludeFilterFile>
     <owasp.suppressions>${basedir}/../src/plugin-config/owasp/owasp-suppressions.xml</owasp.suppressions>
   </properties>

gd-edit-portlet/src/main/java/de/seitenbau/govdata/edit/model/EditForm.java

@@ -42,7 +42,8 @@ public class EditForm implements Serializable
   @NotEmpty
   private String notes;
 
-  @Pattern(regexp = "|[ ]*([a-zäöüß0-9\\-_\\. ])+(,[ ]*[a-zäöüß0-9\\-_\\. ]+)*[ ]*", message = "{tags}", flags = {Flag.CASE_INSENSITIVE})
+  @Pattern(regexp = "|[ ]*([a-zäöüß0-9\\-_\\. ])+(,[ ]*[a-zäöüß0-9\\-_\\. ]+)*[ ]*",
+      message = "{tags}", flags = {Flag.CASE_INSENSITIVE})
   private String tags;
 
   @URL

gd-edit-portlet/src/main/plugin-config/checkstyle-suppressions.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suppressions [
+<!ELEMENT suppressions (suppress*)>
+
+<!ELEMENT suppress EMPTY>
+<!ATTLIST suppress files CDATA #REQUIRED
+                   checks CDATA #IMPLIED
+                   id CDATA #IMPLIED
+                   lines CDATA #IMPLIED
+                   columns CDATA #IMPLIED>
+]>
+<suppressions>
+  <!-- Do not check properties files -->
+  <suppress files="ValidationMessages.properties" checks="LineLength"/>
+</suppressions>

gd-login-web-fragment/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>od-platform</artifactId>
     <groupId>de.seitenbau.govdata.odp</groupId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
   </parent>
 	<artifactId>gd-login-web-fragment</artifactId>
 	<properties>

gd-metadata-quality-portlet/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>od-platform</artifactId>
     <groupId>de.seitenbau.govdata.odp</groupId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
   </parent>
   <artifactId>gd-metadata-quality-portlet</artifactId>
   <packaging>war</packaging>

gd-search-common/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>de.seitenbau.govdata.odp</groupId>
     <artifactId>od-platform</artifactId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
   </parent>
   <artifactId>gd-search-common</artifactId>
   <name>GovData search common</name>

gd-search-common/src/main/java/de/seitenbau/govdata/search/adapter/SearchServiceElasticsearchImpl.java

@@ -236,7 +236,8 @@ public void init() throws ConfigurationException, NumberFormatException, Unknown
     RestClientBuilder builder = RestClient.builder(
         httpHosts.toArray(new HttpHost[0]))
         .setHttpClientConfigCallback(
-            httpClientBuilder -> {
+            httpClientBuilder ->
+            {
               httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider)
                   .setSSLContext(sslContext)
                   .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE)

gd-search-common/src/main/java/de/seitenbau/govdata/search/index/GovDataSearchIndexWriter.java

@@ -46,11 +46,13 @@ public class GovDataSearchIndexWriter implements IndexerPostProcessor
 {
   private static final Locale LOCALE_USED = Locale.GERMANY;
 
-  private IndexQueueAdapterServiceRESTResource indexClient = ApplicationContextProvider.getApplicationContext().getBean(IndexQueueAdapterServiceRESTResource.class);
+  private IndexQueueAdapterServiceRESTResource indexClient =
+      ApplicationContextProvider.getApplicationContext().getBean(IndexQueueAdapterServiceRESTResource.class);
 
   private String indexName = PropsUtil.get(SearchConsts.PARAM_ELASTICSEARCH_LIFERAY_INDEX_NAME);
 
-  private SearchIndexUtil searchIndexUtil = ApplicationContextProvider.getApplicationContext().getBean(SearchIndexUtil.class);
+  private SearchIndexUtil searchIndexUtil =
+      ApplicationContextProvider.getApplicationContext().getBean(SearchIndexUtil.class);
 
   private FilterProxy filterProxy =
       ApplicationContextProvider.getApplicationContext().getBean(FilterProxy.class);
@@ -63,7 +65,9 @@ public void postProcessContextBooleanFilter(BooleanFilter booleanFilter, SearchC
   {
     log.info("postProcessContextBooleanFilter()");
     if (_log.isDebugEnabled())
+    {
       _log.debug("postProcessContextBooleanFilter()");
+    }
   }
 
   @Override
@@ -103,7 +107,9 @@ public void postProcessFullQuery(BooleanQuery fullQuery, SearchContext searchCon
   {
     log.info("postProcessFullQuery()");
     if (_log.isDebugEnabled())
+    {
       _log.debug(" postProcessFullQuery()");
+    }
   }
 
   @Override
@@ -112,15 +118,19 @@ public void postProcessSearchQuery(BooleanQuery searchQuery, BooleanFilter boole
   {
     log.info("postProcessSearchQuery()");
     if (_log.isDebugEnabled())
+    {
       _log.debug(" postProcessSearchQuery()");
+    }
   }
 
   @Override
   public void postProcessSummary(Summary summary, Document document, Locale locale, String snippet)
   {
     log.info("postProcessSummary()");
     if (_log.isDebugEnabled())
+    {
       _log.debug("postProcessSummary()");
+    }
   }
 
   private SearchIndexEntry createSearchIndexEntryWithBasicInformation(String uid)

gd-search-common/src/main/java/de/seitenbau/govdata/search/index/mapper/ClassToTypeMapper.java

@@ -8,12 +8,20 @@ public class ClassToTypeMapper extends HashMap<String, String>
 {
   private static final long serialVersionUID = -515667049799780370L;
 
+  /**
+   * Constuctor.
+   */
   public ClassToTypeMapper()
   {
     put(IndexConstants.CLASS_NAME_BLOGS_ENTRY, "blog");
     put(IndexConstants.CLASS_NAME_JOURNAL_ARTICLE_ENTRY, "article");
   }
 
+  /**
+   * Get type by class.
+   * @param className
+   * @return
+   */
   public String getTypeForClass(String className)
   {
     if (containsKey(className))

gd-search-common/src/main/java/de/seitenbau/govdata/search/sort/SortType.java

@@ -4,7 +4,18 @@
 
 public enum SortType
 {
-  RELEVANCE("relevance"), LASTMODIFICATION("lastmodification"), TITLE("title");
+  /**
+   * Sort type relevance
+   */
+  RELEVANCE("relevance"),
+  /**
+   * Sort type lastmodification
+   */
+  LASTMODIFICATION("lastmodification"),
+  /**
+   * Sort type title
+   */
+  TITLE("title");
 
   SortType(String key)
   {
@@ -16,6 +27,11 @@ public String getKey()
     return key;
   }
 
+  /**
+   * Get SortType by key.
+   * @param key
+   * @return
+   */
   public static SortType fromString(String key)
   {
     for (SortType type : SortType.values())

gd-search/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>de.seitenbau.govdata.odp</groupId>
     <artifactId>od-platform</artifactId>
-    <version>6.4.1</version>
+    <version>6.4.3</version>
     <!-- <relativePath>../GovData</relativePath> -->
   </parent>
   <properties>

gd-search/src/main/java/de/seitenbau/govdata/dataset/details/beans/CurrentMetadataContact.java

@@ -1,20 +1,4 @@
 package de.seitenbau.govdata.dataset.details.beans;
-/**
- * Copyright (c) 2012, 2015 Fraunhofer Institute FOKUS | 2017 SEITENBAU GmbH
- *
- * This file is part of Open Data Platform.
- *
- * Open Data Platform is free software: you can redistribute it and/or modify it under the terms of
- * the GNU Affero General Public License as published by the Free Software Foundation, either
- * version 3 of the License, or (at your option) any later version.
- * 
- * Open Data Plaform is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License along with Open Data
- * Platform. If not, see <http://www.gnu.org/licenses/agpl-3.0>.
- */
 
 import java.util.List;
 import java.util.Objects;