Merge remote-tracking branch 'origin/main' into 44-datastoreimprovements

core/pom.xml

@@ -340,10 +340,6 @@
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>xmlgraphics-commons</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>

core/src/main/java/org/fao/geonet/lib/DbLib.java

@@ -1,5 +1,5 @@
 //=============================================================================
-//===	Copyright (C) 2001-2007 Food and Agriculture Organization of the
+//===	Copyright (C) 2001-2024 Food and Agriculture Organization of the
 //===	United Nations (FAO-UN), United Nations World Food Programme (WFP)
 //===	and United Nations Environment Programme (UNEP)
 //===
@@ -67,7 +67,7 @@ public void insertData(ServletContext servletContext, final ServiceContext conte
         runSQL(context, data);
     }
 
-    static public void runSQL(final ServiceContext context, final List<String> data) {
+    public static void runSQL(final ServiceContext context, final List<String> data) {
         TransactionManager.runInTransaction("Apply SQL statements in database", context.getApplicationContext(),
             TransactionManager.TransactionRequirement.CREATE_ONLY_WHEN_NEEDED, TransactionManager.CommitBehavior.ALWAYS_COMMIT, false,
             new TransactionTask<Object>() {
@@ -88,7 +88,7 @@ public void insertData(ServletContext servletContext, Statement statement, Path
         runSQL(statement, data, true);
     }
 
-    static private void runSQL(EntityManager entityManager, List<String> data, boolean failOnError) throws Exception {
+    private static void runSQL(EntityManager entityManager, List<String> data, boolean failOnError) throws Exception {
         StringBuffer sb = new StringBuffer();
 
         boolean inBlock = false;
@@ -244,7 +244,7 @@ private List<String> loadSqlDataFile(ServletContext servletContext, ApplicationC
             Path file = checkFilePath(servletContext, appPath, filePath, filePrefix, DatabaseType.lookup(connection).toString());
 
             // --- load the sql data
-            return Lib.text.load(servletContext, appPath, file, Constants.ENCODING);
+            return Lib.text.load(file, Constants.ENCODING);
         } finally {
             if (connection != null) {
                 connection.close();
@@ -258,7 +258,7 @@ private List<String> loadSqlDataFile(ServletContext servletContext, Statement st
         Path file = checkFilePath(servletContext, appPath, filePath, filePrefix, DatabaseType.lookup(statement.getConnection()).toString());
 
         // --- load the sql data
-        return Lib.text.load(servletContext, appPath, file, Constants.ENCODING);
+        return Lib.text.load(file, Constants.ENCODING);
     }
 
 }

core/src/main/java/org/fao/geonet/lib/ElementLib.java

@@ -1,5 +1,5 @@
 //=============================================================================
-//===	Copyright (C) 2001-2007 Food and Agriculture Organization of the
+//===	Copyright (C) 2001-2024 Food and Agriculture Organization of the
 //===	United Nations (FAO-UN), United Nations World Food Programme (WFP)
 //===	and United Nations Environment Programme (UNEP)
 //===
@@ -46,7 +46,7 @@ public class ElementLib {
     //-----------------------------------------------------------------------------
 
     public Set<String> getIds(Element elem) {
-        HashSet<String> hs = new HashSet<String>();
+        HashSet<String> hs = new HashSet<>();
 
         for (Object child : elem.getChildren())
             hs.add(((Element) child).getChildText("id"));
@@ -57,7 +57,7 @@ public Set<String> getIds(Element elem) {
     //-----------------------------------------------------------------------------
 
     public Element pruneChildren(Element elem, Set<Integer> ids) {
-        ArrayList<Element> alToPrune = new ArrayList<Element>();
+        ArrayList<Element> alToPrune = new ArrayList<>();
 
         //--- collect elements to prune
 

core/src/main/java/org/fao/geonet/lib/Lib.java

@@ -1,5 +1,5 @@
 //=============================================================================
-//===	Copyright (C) 2001-2007 Food and Agriculture Organization of the
+//===	Copyright (C) 2001-2024 Food and Agriculture Organization of the
 //===	United Nations (FAO-UN), United Nations World Food Programme (WFP)
 //===	and United Nations Environment Programme (UNEP)
 //===
@@ -24,11 +24,16 @@
 package org.fao.geonet.lib;
 
 public class Lib {
-    public final static ElementLib element = new ElementLib();
-    public final static DbLib db = new DbLib();
-    public final static ResourceLib resource = new ResourceLib();
-    public final static TypeLib type = new TypeLib();
-    public final static NetLib net = new NetLib();
-    public final static SourcesLib sources = new SourcesLib();
-    public final static TextLib text = new TextLib();
+    public static final ElementLib element = new ElementLib();
+    public static final DbLib db = new DbLib();
+    public static final ResourceLib resource = new ResourceLib();
+    public static final TypeLib type = new TypeLib();
+    public static final NetLib net = new NetLib();
+    public static final TextLib text = new TextLib();
+
+    /**
+     * Private constructor to avoid instantiate the class.
+     */
+    private Lib() {
+    }
 }

core/src/main/java/org/fao/geonet/lib/NetLib.java

@@ -1,5 +1,5 @@
 //=============================================================================
-//===	Copyright (C) 2001-2023 Food and Agriculture Organization of the
+//===	Copyright (C) 2001-2024 Food and Agriculture Organization of the
 //===	United Nations (FAO-UN), United Nations World Food Programme (WFP)
 //===	and United Nations Environment Programme (UNEP)
 //===
@@ -43,7 +43,7 @@
 import java.net.Proxy;
 import java.net.URL;
 import java.net.URLConnection;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 import java.util.regex.PatternSyntaxException;
 
@@ -229,7 +229,7 @@ public URLConnection setupProxy(ServiceContext context, URL url) throws IOExcept
                     conn = url.openConnection(proxy);
 
                     if (username.trim().length() != 0) {
-                        String encodedUserPwd = new Base64().encodeAsString((username + ":" + password).getBytes(Charset.forName("UTF-8")));
+                        String encodedUserPwd = new Base64().encodeAsString((username + ":" + password).getBytes(StandardCharsets.UTF_8));
                         conn.setRequestProperty("Accept-Charset", "UTF-8");
                         conn.setRequestProperty("Proxy-Authorization", "Basic " + encodedUserPwd);
                     }

core/src/main/java/org/fao/geonet/lib/ResourceLib.java

@@ -132,7 +132,7 @@ public void checkPrivilege(ServiceContext context, String id,
         denyAccess(context);
     }
 
-    public void denyAccess(ServiceContext context) throws Exception {
+    public void denyAccess(ServiceContext context) throws AccessDeniedException, OperationNotAllowedEx {
         if (context.getUserSession().isAuthenticated()) {
             throw new AccessDeniedException("User is not permitted to access this resource");
         } else {
@@ -150,6 +150,9 @@ public void checkEditPrivilege(ServiceContext context, String id)
             denyAccess(context);
     }
 
+    /**
+     * @return the absolute path of the folder choosen to store all deleted metadata
+     */
     public Path getRemovedDir(int id) {
         ApplicationContext appContext = ApplicationContextHolder.get();
         GeonetworkDataDirectory dataDirectory = appContext.getBean(GeonetworkDataDirectory.class);
@@ -173,10 +176,10 @@ public Path getRemovedDir(Path removedDir, String id) {
     // ---
     // -----------------------------------------------------------------------------
 
-    private String pad(int group, int lenght) {
+    private String pad(int group, int length) {
         String text = Integer.toString(group);
 
-        while (text.length() < lenght)
+        while (text.length() < length)
             text = "0" + text;
 
         return text;

core/src/main/java/org/fao/geonet/lib/TextLib.java

@@ -1,5 +1,5 @@
 //=============================================================================
-//===	Copyright (C) 2001-2007 Food and Agriculture Organization of the
+//===	Copyright (C) 2001-2024 Food and Agriculture Organization of the
 //===	United Nations (FAO-UN), United Nations World Food Programme (WFP)
 //===	and United Nations Environment Programme (UNEP)
 //===
@@ -26,11 +26,11 @@
 import org.fao.geonet.Util;
 import org.fao.geonet.utils.IO;
 
-import javax.servlet.ServletContext;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -41,27 +41,25 @@
 public class TextLib {
     private static final Random RANDOM = new Random();
 
-    public List<String> load(ServletContext servletContext, Path appPath, Path file) throws IOException {
-        return load(servletContext, appPath, file, "ISO-8859-1");
+    public List<String> load(Path file) throws IOException {
+        return load(file, "ISO-8859-1");
     }
 
-    public List<String> load(ServletContext servletContext, Path appPath, Path file, String encoding) throws IOException {
-        BufferedReader reader = IO.newBufferedReader(file, Charset.forName(encoding));
-        List<String> al = new ArrayList<String>();
-        String line = reader.readLine();
-        try {
+    public List<String> load(Path file, String encoding) throws IOException {
+        try(BufferedReader reader = IO.newBufferedReader(file, Charset.forName(encoding))) {
+            List<String> al = new ArrayList<>();
+            String line = reader.readLine();
+
             while (line != null) {
                 al.add(line);
                 line = reader.readLine();
             }
             return al;
-        } finally {
-            reader.close();
         }
     }
 
     public void save(Path file, List<String> lines) throws IOException {
-        try (BufferedWriter ow = Files.newBufferedWriter(file, Charset.forName("ISO-8859-1"))) {
+        try (BufferedWriter ow = Files.newBufferedWriter(file, StandardCharsets.ISO_8859_1)) {
             for (String line : lines) {
                 ow.write(line);
                 ow.newLine();