Changeset 12865 in josm for trunk/src/org/openstreetmap/josm/data/cache

Timestamp:

2017-09-15T01:20:41+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11390 - SonarQube - squid:S3824 - "Map.get" and value test should be replaced with single method call

Location:

trunk/src/org/openstreetmap/josm/data/cache

Files:

• CacheEntryAttributes.java (modified) (1 diff)
• HostLimitQueue.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java

@@ -89 +89 @@
      */
     private long getLongAttr(String key) {
-        String val = attrs.get(key);
-        if (val == null) {
-            attrs.put(key, "0");
-            return 0;
-        }
         try {
-            return Long.parseLong(val);
+            return Long.parseLong(attrs.computeIfAbsent(key, k -> "0"));
         } catch (NumberFormatException e) {
             attrs.put(key, "0");

trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java

@@ -159 +159 @@
         if (limit == null) {
             synchronized (hostSemaphores) {
-                limit = hostSemaphores.get(host);
-                if (limit == null) {
-                    limit = new Semaphore(hostLimit);
-                    hostSemaphores.put(host, limit);
-                }
+                limit = hostSemaphores.computeIfAbsent(host, k -> new Semaphore(hostLimit));
             }
         }