Metadata editor / Support add embedded multilingual / Simplify XPath …

…and sonarlint.
geonetwork · Dec 9, 2024 · 3d7a65c · 3d7a65c
1 parent fa44961
commit 3d7a65c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/...2018/src/main/java/org/fao/geonet/schema/iso19115_3_2018/ISO19115_3_2018SchemaPlugin.java b/...2018/src/main/java/org/fao/geonet/schema/iso19115_3_2018/ISO19115_3_2018SchemaPlugin.java
@@ -588,23 +588,13 @@ public boolean duplicateElementsForMultilingual() {
     @Override
     public List<String> getMetadataLanguages(Element metadata) {
         try {
-             Xml.selectNodes(metadata, ".//mdb:defaultLocale/lan:PT_Locale/@id", allNamespaces.asList())
+             return Xml.selectNodes(metadata, ".//*[name() = 'mdb:defaultLocale' or name() = 'mdb:otherLocale']/lan:PT_Locale/@id", allNamespaces.asList())
                 .stream()
-                .filter(node -> node instanceof Attribute)
+                .filter(Attribute.class::isInstance)
                 .map(node -> ((Attribute)node).getValue())
                 .filter(s -> s != null && !s.isBlank())
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList()).addAll(
-                     Xml.selectNodes(metadata, ".//mdb:otherLocale/lan:PT_Locale/@id", allNamespaces.asList())
-                         .stream()
-                         .filter(node -> node instanceof Attribute)
-                         .map(node -> ((Attribute)node).getValue())
-                         .filter(s -> s != null && !s.isBlank())
-                         .filter(Objects::nonNull)
-                         .collect(Collectors.toList())
-                 );
-        } catch (JDOMException e) {
-            e.printStackTrace();
+                .collect(Collectors.toList());
+        } catch (JDOMException ignored) {
         }
         return Collections.emptyList();
     }

diff --git a/schemas/iso19139/src/main/java/org/fao/geonet/schema/iso19139/ISO19139SchemaPlugin.java b/schemas/iso19139/src/main/java/org/fao/geonet/schema/iso19139/ISO19139SchemaPlugin.java
@@ -617,13 +617,11 @@ public List<String> getMetadataLanguages(Element metadata) {
         try {
             return Xml.selectNodes(metadata, ".//gmd:locale/gmd:PT_Locale/@id", allNamespaces.asList())
                 .stream()
-                .filter(node -> node instanceof Attribute)
+                .filter(Attribute.class::isInstance)
                 .map(node -> ((Attribute)node).getValue())
                 .filter(s -> s != null && !s.isBlank())
-                .filter(Objects::nonNull)
                 .collect(Collectors.toList());
-        } catch (JDOMException e) {
-            e.printStackTrace();
+        } catch (JDOMException ignored) {
         }
         return Collections.emptyList();
     }