Bump org.jolokia:jolokia-core from 1.6.0 to 1.7.2

.github/workflows/geonetwork-docker.yml

@@ -0,0 +1,55 @@
+name: CI
+
+on:
+  push:
+    branches:
+    - geocat_v4.2.3_report_custom*
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+
+    - name: "Checking out"
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+
+    - name: "Setting up JDK 1.8"
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+
+    - name: "Cache Maven packages"
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+
+    - name: "Update maven dependencies"
+      run: mvn -Pdocker de.qaware.maven:go-offline-maven-plugin:resolve-dependencies
+
+    - name: Increase system limits
+      run: sudo sysctl -w vm.max_map_count=262144
+
+    - name: run tests
+      run: |
+        mvn resources:resources@copy-index-schema-to-source -f web
+        mvn clean verify -Pit
+    - name: "Installing"
+      run: mvn -B clean -DskipTests install -Ddb.username=db_username -Ddb.name=db_name -Ddb.type=postgres-postgis -Ddb.host=db_host -Ddb.password=db_password -Ddb.pool.maxActive=50 -Ddb.port=5432
+
+    - name: "Setting image tag"
+      id: version
+      run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
+
+    - name: "Building docker image"
+      run: mvn -pl web -Pdocker docker:build -DdockerImageName=docker.pkg.github.com/geoadmin/geocat/geocat:${{ steps.version.outputs.VERSION }}-${{ github.run_number }}
+
+    - name: "Login to docker.pkg.github.com"
+      run: docker login -u $GITHUB_ACTOR -p ${{ secrets.GITHUB_TOKEN }} docker.pkg.github.com
+
+    - name: "Push to GitHub Packages"
+      run: docker push docker.pkg.github.com/geoadmin/geocat/geocat:${{ steps.version.outputs.VERSION }}-${{ github.run_number }}

.github/workflows/sonarcloud.yml

@@ -2,9 +2,7 @@ name: SonarCloud QA
 on:
   push:
     branches:
-      - main
-      - 4.0.x
-      - 3.12.x
+      - geocat_v4.2.3_report_custom
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
@@ -19,12 +17,9 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
           submodules: 'recursive'
-      # For building GeoNetwork, JDK8 is necessary, but for running
-      # the SonarQube plugin, JDK11 is necessary.
-      # So, first install JDK 8, build GeoNetwork, then install JDK11
-      # and run SonarQube:
-      - name: Set up JDK 8
-        uses: actions/[email protected]
+          show-progress: 'false'
+      - name: Set up JDK 11
+        uses: actions/[email protected]
         with:
           java-version: 8
           distribution: 'temurin'
@@ -37,11 +32,13 @@ jobs:
           restore-keys: ${{ runner.os }}-sonar
       - name: Build GN
         run: mvn -B package -DskipTests
-      - name: Set up JDK 11
-        uses: actions/[email protected]
+
+      - name: Set up JDK 21 # Sonarcloud analyzer needs at least JDK 17
+        uses: actions/[email protected]
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '21'
+          cache: 'maven'
       - name: Analyze with Sonar
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any

common/src/main/java/org/fao/geonet/exceptions/GNException.java

@@ -0,0 +1,34 @@
+//=============================================================================
+//===	Copyright (C) 2001-2023 Food and Agriculture Organization of the
+//===	United Nations (FAO-UN), United Nations World Food Programme (WFP)
+//===	and United Nations Environment Programme (UNEP)
+//===
+//===	This program is free software; you can redistribute it and/or modify
+//===	it under the terms of the GNU General Public License as published by
+//===	the Free Software Foundation; either version 2 of the License, or (at
+//===	your option) any later version.
+//===
+//===	This program 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
+//===	General Public License for more details.
+//===
+//===	You should have received a copy of the GNU General Public License
+//===	along with this program; if not, write to the Free Software
+//===	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+//===
+//===	Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+//===	Rome - Italy. email: [email protected]
+//==============================================================================
+package org.fao.geonet.exceptions;
+
+public class GNException extends RuntimeException {
+
+    public GNException(String msg) {
+        super(msg);
+    }
+
+    public GNException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}

core/src/main/java/org/fao/geonet/kernel/SpringLocalServiceInvoker.java

@@ -22,8 +22,6 @@
  */
 package org.fao.geonet.kernel;
 
-import org.fao.geonet.NodeInfo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockHttpSession;
@@ -43,16 +41,19 @@
 
 public class SpringLocalServiceInvoker {
 
-    @Autowired
-    public RequestMappingHandlerMapping requestMappingHandlerMapping;
+    public final RequestMappingHandlerMapping requestMappingHandlerMapping;
 
-    @Autowired
-    public RequestMappingHandlerAdapter requestMappingHandlerAdapter;
+    public final RequestMappingHandlerAdapter requestMappingHandlerAdapter;
 
     private HandlerMethodArgumentResolverComposite argumentResolvers;
     private HandlerMethodReturnValueHandlerComposite returnValueHandlers;
     private DefaultDataBinderFactory webDataBinderFactory;
 
+    public SpringLocalServiceInvoker(RequestMappingHandlerMapping requestMappingHandlerMapping, RequestMappingHandlerAdapter requestMappingHandlerAdapter) {
+        this.requestMappingHandlerMapping = requestMappingHandlerMapping;
+        this.requestMappingHandlerAdapter = requestMappingHandlerAdapter;
+    }
+
     public void init() {
         argumentResolvers = new HandlerMethodArgumentResolverComposite().addResolvers(requestMappingHandlerAdapter.getArgumentResolvers());
         returnValueHandlers = new HandlerMethodReturnValueHandlerComposite().addHandlers(requestMappingHandlerAdapter.getReturnValueHandlers());

core/src/main/java/org/fao/geonet/kernel/Thesaurus.java

@@ -1100,7 +1100,7 @@ public KeywordBean getKeyword(String uri, String... languages) {
         String cacheKey = "getKeyword" + uri + Arrays.stream(languages).collect(Collectors.joining(""));
         Object cacheValue = THESAURUS_SEARCH_CACHE.getIfPresent(cacheKey);
         if (cacheValue != null) {
-            return (KeywordBean) cacheValue;
+            //return (KeywordBean) cacheValue;
         }
 
         List<KeywordBean> keywords;

core/src/main/java/org/fao/geonet/kernel/datamanager/base/BaseMetadataManager.java

@@ -23,6 +23,7 @@
 
 package org.fao.geonet.kernel.datamanager.base;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
@@ -33,19 +34,20 @@
 import jeeves.transaction.TransactionTask;
 import jeeves.xlink.Processor;
 import org.apache.commons.lang.StringUtils;
+import org.elasticsearch.action.search.SearchResponse;
 import org.fao.geonet.ApplicationContextHolder;
 import org.fao.geonet.constants.Edit;
 import org.fao.geonet.constants.Geonet;
 import org.fao.geonet.constants.Params;
 import org.fao.geonet.domain.*;
+import org.fao.geonet.exceptions.GNException;
 import org.fao.geonet.exceptions.UnAuthorizedException;
 import org.fao.geonet.kernel.*;
 import org.fao.geonet.kernel.datamanager.*;
 import org.fao.geonet.kernel.schema.MetadataSchema;
 import org.fao.geonet.kernel.schema.SchemaPlugin;
 import org.fao.geonet.kernel.search.EsSearchManager;
 import org.fao.geonet.kernel.search.IndexingMode;
-import org.fao.geonet.kernel.search.MetaSearcher;
 import org.fao.geonet.kernel.search.index.BatchOpsMetadataReindexer;
 import org.fao.geonet.kernel.setting.SettingManager;
 import org.fao.geonet.kernel.setting.Settings;
@@ -104,8 +106,6 @@ public class BaseMetadataManager implements IMetadataManager {
     @Autowired
     private GroupRepository groupRepository;
     @Autowired
-    private MetadataStatusRepository metadataStatusRepository;
-    @Autowired
     private MetadataValidationRepository metadataValidationRepository;
     @Autowired
     private MetadataRepository metadataRepository;
@@ -141,6 +141,10 @@ public class BaseMetadataManager implements IMetadataManager {
 
     @Autowired
     private ApplicationContext _applicationContext;
+
+    @VisibleForTesting
+    public int maxMdsReferencingSubTemplate = 10000;
+
     @PersistenceContext
     private EntityManager _entityManager;
 
@@ -747,6 +751,9 @@ public synchronized AbstractMetadata updateMetadata(final ServiceContext context
                     getSearchManager().delete(String.format("+uuid:\"%s\"", uuidBeforeUfo));
                 }
                 metadataIndexer.indexMetadata(metadataId, true, indexingMode);
+                if (metadata.getDataInfo().getType() == MetadataType.SUB_TEMPLATE) {
+                    indexMdsReferencingSubTemplate(context, metadata);
+                }
             }
         }
 
@@ -1314,4 +1321,26 @@ boolean hasReferencingMetadata(ServiceContext context, AbstractMetadata metadata
         return this.searchManager.query(query.toString(), null, 0, 0).getHits().getTotalHits().value > 0;
     }
 
+    private void indexMdsReferencingSubTemplate(ServiceContext context, AbstractMetadata subTemplate) throws Exception {
+        StringBuilder query = new StringBuilder(String.format("xlink:*%s*", subTemplate.getUuid()));
+        SearchResponse response = this.searchManager.query(query.toString(), null, 0, maxMdsReferencingSubTemplate);
+        if (response.getHits().getTotalHits().value > maxMdsReferencingSubTemplate) {
+            throw new GNException("Not implemented");
+        }
+        ArrayList<String> toIndex = new ArrayList<>();
+        response.getHits().forEach(consumer -> {
+            String consumerUuid = consumer.getId();
+            try {
+                String consumerId = this.metadataUtils.getMetadataId(consumerUuid);
+                if (consumerId != null) {
+                    toIndex.add(consumerId);
+                }
+            } catch (RuntimeException e) {
+                throw e;
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        metadataIndexer.batchIndexInThreadPool(context, toIndex);
+    }
 }

core/src/main/java/org/fao/geonet/kernel/mef/Importer.java

@@ -519,6 +519,8 @@ public static void importRecord(String uuid, MEFLib.UuidAction uuidAction, List<
                     if (Log.isDebugEnabled(Geonet.MEF)) {
                         Log.debug(Geonet.MEF, "Deleting existing metadata with UUID : " + uuid);
                     }
+                    Store store = context.getBean("resourceStore", Store.class);
+                    store.delResources(context, uuid, true);
                     metadataManager.deleteMetadata(context, dm.getMetadataId(uuid));
                     metadataManager.flush();
                 }