Fixed #1113 - NPE thrown when attempting to import multiple stubs via the API with no import options

Author: tomakehurst

src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java

@@ -33,6 +33,7 @@
 import com.github.tomakehurst.wiremock.verification.*;
 import com.github.tomakehurst.wiremock.verification.diff.PlainTextDiffRenderer;
 import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
@@ -45,6 +46,7 @@
 import static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;
 import static com.github.tomakehurst.wiremock.stubbing.ServeEvent.NOT_MATCHED;
 import static com.github.tomakehurst.wiremock.stubbing.ServeEvent.TO_LOGGED_REQUEST;
+import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.collect.FluentIterable.from;
 import static com.google.common.collect.Iterables.contains;
 import static com.google.common.collect.Iterables.transform;
@@ -436,18 +438,20 @@ public void removeStubsByMetadata(StringValuePattern pattern) {
     @Override
     public void importStubs(StubImport stubImport) {
         List<StubMapping> mappings = stubImport.getMappings();
+        StubImport.Options importOptions = firstNonNull(stubImport.getImportOptions(), StubImport.Options.DEFAULTS);
+
         for (int i = mappings.size() - 1; i >= 0; i--) {
             StubMapping mapping = mappings.get(i);
             if (mapping.getId() != null && getStubMapping(mapping.getId()).isPresent()) {
-                if (stubImport.getImportOptions().getDuplicatePolicy() == StubImport.Options.DuplicatePolicy.OVERWRITE) {
+                if (importOptions.getDuplicatePolicy() == StubImport.Options.DuplicatePolicy.OVERWRITE) {
                     editStubMapping(mapping);
                 }
             } else {
                 addStubMapping(mapping);
             }
         }
 
-        if (stubImport.getImportOptions().getDeleteAllNotInImport()) {
+        if (importOptions.getDeleteAllNotInImport()) {
             Iterable<UUID> ids = transform(mappings, new Function<StubMapping, UUID>() {
                 @Override
                 public UUID apply(StubMapping input) {

src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java

@@ -712,4 +712,40 @@ public void updateGlobalSettingsViaPut() {
         assertThat(wireMockServer.getGlobalSettings().getSettings().getExtended().getInt("mySetting"), is(123));
     }
 
+    static final String STUB_IMPORT_JSON = "{\n" +
+            "  \"mappings\": [\n" +
+            "    {\n" +
+            "      \"request\": {\n" +
+            "        \"url\": \"/one\",\n" +
+            "        \"method\": \"GET\"\n" +
+            "      },\n" +
+            "      \"response\": {\n" +
+            "        \"status\": 200\n" +
+            "      }\n" +
+            "    },\n" +
+            "    {\n" +
+            "      \"request\": {\n" +
+            "        \"url\": \"/two\",\n" +
+            "        \"method\": \"GET\"\n" +
+            "      },\n" +
+            "      \"response\": {\n" +
+            "        \"status\": 200\n" +
+            "      }\n" +
+            "    }\n" +
+            "  ]\n" +
+            "}";
+
+    @Test
+    public void importMultipleStubsWithDefaultParameters() {
+        WireMockResponse response = testClient.postJson("/__admin/mappings/import", STUB_IMPORT_JSON);
+
+        assertThat(response.statusCode(), is(200));
+
+        List<StubMapping> allStubs = wm.getStubMappings();
+        assertThat(allStubs.size(), is(2));
+        assertThat(allStubs.get(0).getRequest().getUrl(), is("/one"));
+        assertThat(allStubs.get(1).getRequest().getUrl(), is("/two"));
+
+    }
+
 }