Changeset 14153 in josm for trunk/test/unit/org/openstreetmap/josm/testutils/PluginServer.java

Timestamp:

2018-08-13T02:18:54+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main.parent and Main itself

File:

• trunk/test/unit/org/openstreetmap/josm/testutils/PluginServer.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/testutils/PluginServer.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.testutils;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 
 import java.io.File;
@@ -12 +14 @@
 import java.util.stream.Collectors;
 
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.tools.Logging;
 
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-import com.google.common.collect.ImmutableList;
-
+import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.client.MappingBuilder;
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
@@ -25 +25 @@
 import com.github.tomakehurst.wiremock.core.Options;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import com.github.tomakehurst.wiremock.WireMockServer;
-
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import com.google.common.collect.ImmutableList;
 
 public class PluginServer {
@@ -75 +73 @@
 
         public String getRemotePluginsListManifestSection() {
-            final Map<String, String> attrs = new HashMap<String, String>();
+            final Map<String, String> attrs = new HashMap<>();
             JarFile jarFile = null;
 
@@ -239 +237 @@
             return super.apply(new Statement() {
                 @Override
-                @SuppressWarnings("unchecked")
                 public void evaluate() throws Throwable {
                     PluginServer.this.applyToWireMockServer(PluginServerRule.this);