Changeset 13824 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2018-05-23T21:03:31+02:00 (7 years ago)

Author:

Don-vip

Message:

SonarQube - fix code style issues

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -43 +43 @@
  */
 public class WMSImagery {
-
 
     private static final String CAPABILITIES_QUERY_STRING = "SERVICE=WMS&REQUEST=GetCapabilities";
@@ -120 +119 @@
     }
 
-    private Map<String, String> headers = new ConcurrentHashMap<>();
+    private final Map<String, String> headers = new ConcurrentHashMap<>();
     private String version = "1.1.1"; // default version
     private String getMapUrl;
     private URL capabilitiesUrl;
-    private List<String> formats = new ArrayList<>();
+    private final List<String> formats = new ArrayList<>();
     private List<LayerDetails> layers = new ArrayList<>();
 
@@ -283 +282 @@
         return buildGetMapUrl(
                 getLayers(selectedLayers),
-                selectedLayers.stream().map(x -> x.getStyle()).collect(Collectors.toList()),
+                selectedLayers.stream().map(DefaultLayer::getStyle).collect(Collectors.toList()),
                 transparent);
     }
@@ -296 +295 @@
     public String buildGetMapUrl(List<LayerDetails> selectedLayers, List<String> selectedStyles, boolean transparent) {
         return buildGetMapUrl(
-                selectedLayers.stream().map(x -> x.getName()).collect(Collectors.toList()),
+                selectedLayers.stream().map(LayerDetails::getName).collect(Collectors.toList()),
                 selectedStyles,
                 getPreferredFormat(),
@@ -504 +503 @@
      */
     public boolean belowWMS130() {
-        return this.version.equals("1.1.1") || this.version.equals("1.1") || this.version.equals("1.0");
+        return "1.1.1".equals(version) || "1.1".equals(version) || "1.0".equals(version);
     }
 
@@ -569 +568 @@
     }
 
-    private Bounds parseBBox(Projection conv, String miny, String minx, String maxy, String maxx) {
+    private static Bounds parseBBox(Projection conv, String miny, String minx, String maxy, String maxx) {
         if (miny == null || minx == null || maxy == null || maxx == null) {
             return null;
@@ -592 +591 @@
     }
 
-    private String normalizeUrl(String serviceUrlStr) throws MalformedURLException {
+    private static String normalizeUrl(String serviceUrlStr) throws MalformedURLException {
         URL getCapabilitiesUrl = null;
         String ret = null;
@@ -683 +682 @@
     }
 
-
     /**
      * @param defaultLayers default layers that should select layer object
@@ -689 +687 @@
      */
     public List<LayerDetails> getLayers(List<DefaultLayer> defaultLayers) {
-        Collection<String> layerNames = defaultLayers.stream().map(x -> x.getLayerName()).collect(Collectors.toList());
+        Collection<String> layerNames = defaultLayers.stream().map(DefaultLayer::getLayerName).collect(Collectors.toList());
         return layers.stream()
                 .flatMap(LayerDetails::flattened)