Changeset 16188 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2020-03-21T22:09:31+01:00 (4 years ago)

Author:

simon04

Message:

see #18954, see #18864 - fix SonarQube issues

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• GenericParser.java (modified) (4 diffs)
• StringParser.java (modified) (2 diffs)
• XmlObjectParser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/GenericParser.java

@@ -10 +10 @@
  * Utility class to parse various types from other values.
  *
+ * @param <U> the type of the objects to parse
  * @since 16184
  */
@@ -16 +17 @@
     protected final Map<Class<?>, Function<U, ?>> parsers;
 
+    /**
+     * Creates an empty {@code GenericParser}
+     */
     public GenericParser() {
         this(new LinkedHashMap<>());
@@ -29 +33 @@
     }
 
+    /**
+     * Creates a new {@code GenericParser} with the same parsers as the specified map
+     *
+     * @param parsers the parsers
+     */
     protected GenericParser(Map<Class<?>, Function<U, ?>> parsers) {
         this.parsers = parsers;
@@ -80 +89 @@
      * or {@code Optional.empty()} (if parsing fails, or the type is not {@linkplain #supports supported})
      */
-    public <T> Optional<?> tryParse(Class<?> type, U value) {
+    public <T> Optional<T> tryParse(Class<T> type, U value) {
         try {
             return Optional.ofNullable(parse(type, value));

trunk/src/org/openstreetmap/josm/tools/StringParser.java

@@ -36 +36 @@
             .parsers));
 
+    /**
+     * Creates an empty {@code StringParser}
+     */
     public StringParser() {
         super();
@@ -49 +52 @@
     }
 
-    protected StringParser(Map<Class<?>, Function<String, ?>> parsers) {
+    private StringParser(Map<Class<?>, Function<String, ?>> parsers) {
         super(parsers);
     }

trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -126 +126 @@
         }
 
-        private void setValue(Entry entry, String fieldName, String value) throws SAXException {
-            if (value != null) {
-                value = value.intern();
-            }
+        private void setValue(Entry entry, String fieldName, String value0) throws SAXException {
+            final String value = value0 != null ? value0.intern() : null;
             CheckParameterUtil.ensureParameterNotNull(entry, "entry");
             if ("class".equals(fieldName) || "default".equals(fieldName) || "throw".equals(fieldName) ||
@@ -142 +140 @@
                     f = entry.getField("locale_" + fieldName.substring(lang.length()));
                 }
-                Optional<?> parsed;
-                if (f != null && Modifier.isPublic(f.getModifiers()) && (parsed = primitiveParsers.tryParse(f.getType(), value)).isPresent()) {
+                Optional<?> parsed = Optional.ofNullable(f)
+                        .filter(field -> Modifier.isPublic(field.getModifiers()))
+                        .flatMap(field -> primitiveParsers.tryParse(field.getType(), value));
+                if (parsed.isPresent()) {
                     f.set(c, parsed.get());
                 } else {