fix #32: if wiremockFilesDir contains other files than mapping files …

…it fails

README.md

@@ -6,6 +6,7 @@ Properties:
 * `wiremockFilesDir` the directory where to find the wiremock files
 * `wiremockUrl` the wiremock urls, comma separated, including api endpoint, e.g. `http://localhost:9999/__admin/mappings` or `http://localhost:9999/__admin/settings`
 * `useProxy` on port 8888, for example to use with fiddler
+* `continueOnUploadError` if true, continue uploading other files if an upload error occurs, default is true
 
 Custom events:
 * `wiremock-change-mappings` use to change delay of wiremock mapping file at specific time
@@ -15,6 +16,8 @@ Custom events:
 Use the correct type of file for each event. For import use the exported file of wiremock studio
 that contains multiple mappings.
 
+All files should 
+
 Example wiremock response with a dynamic delay:
 
 ```json

src/main/java/io/perfana/event/wiremock/WiremockClient.java

@@ -104,7 +104,7 @@ void uploadFileWithReplacements(String fileContents, Map<String, String> replace
             HttpPost httpPost = new HttpPost(uriBuilder.build());
             String replaced = injectReplacements(fileContents, replacements);
 
-            logger.debug("About to send to " + uriPath + ": " + replaced);
+            logger.debug("About to send to " + uriPath + ": " + reduceLength(replaced, 2048));
 
             StringEntity data = new StringEntity(replaced, CHARSET_UTF8);
 
@@ -118,6 +118,13 @@ void uploadFileWithReplacements(String fileContents, Map<String, String> replace
         }
     }
 
+    private static String reduceLength(String text, int maxLength) {
+        if (text.length() > maxLength) {
+            return text.substring(0, maxLength) + "...";
+        }
+        return text;
+    }
+
     private String injectReplacements(String fileContents, Map<String, String> replacements) {
         return replacements.entrySet().stream()
                 .map(token -> (Function<String, String>) s -> replaceAllTokensInString(s, token))

src/main/java/io/perfana/event/wiremock/WiremockEvent.java

@@ -23,7 +23,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -75,15 +74,29 @@ private void importAllWiremockFiles(WiremockClient client, File[] files, Map<Str
                 .peek(file -> logger.info("check " + file))
                 .filter(file -> !file.isDirectory())
                 .filter(File::canRead)
+                .filter(file -> file.getName().endsWith(".json"))
                 .peek(file -> logger.info("import " + file))
                 .map(this::readContents)
                 .filter(Objects::nonNull)
-                .forEach(fileContents -> client.uploadFileWithReplacements(fileContents, replacements, uriPath));
+                .forEach(fileContents -> uploadWithTryCatch(client, replacements, uriPath, fileContents));
+    }
+
+    private void uploadWithTryCatch(WiremockClient client, Map<String, String> replacements, String uriPath, String fileContents) {
+        try {
+            client.uploadFileWithReplacements(fileContents, replacements, uriPath);
+        } catch (Exception e) {
+            if (eventContext.isContinueOnUploadError()) {
+                logger.error("Error uploading file: " + e.getMessage());
+            } else {
+                logger.error("Error uploading file: " + e.getMessage());
+                throw e;
+            }
+        }
     }
 
     private String readContents(File file) {
         try {
-            return new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
+            return Files.readString(file.toPath());
         } catch (IOException e) {
             logger.error("reading file: " + file);
             return null;

src/main/java/io/perfana/event/wiremock/WiremockEventConfig.java

@@ -21,6 +21,7 @@ public class WiremockEventConfig extends EventConfig {
     private String wiremockFilesDir;
     private String wiremockUrl;
     private boolean useProxy = false;
+    private boolean continueOnUploadError = true;
 
     public void setWiremockFilesDir(String wiremockFilesDir) {
         this.wiremockFilesDir = wiremockFilesDir;
@@ -34,9 +35,13 @@ public void setUseProxy(boolean useProxy) {
         this.useProxy = useProxy;
     }
 
+    public void setContinueOnUploadError(boolean continueOnUploadError) {
+        this.continueOnUploadError = continueOnUploadError;
+    }
+
     @Override
     public WiremockEventContext toContext() {
-        return new WiremockEventContext(super.toContext(), wiremockFilesDir, wiremockUrl, useProxy);
+        return new WiremockEventContext(super.toContext(), wiremockFilesDir, wiremockUrl, useProxy, continueOnUploadError);
     }
 
     @Override
@@ -45,6 +50,7 @@ public String toString() {
             "wiremockFilesDir='" + wiremockFilesDir + '\'' +
             ", wiremockUrl='" + wiremockUrl + '\'' +
             ", useProxy=" + useProxy +
+            ", continueOnUploadError=" + continueOnUploadError +
             "} " + super.toString();
     }
 }

src/main/java/io/perfana/event/wiremock/WiremockEventContext.java

@@ -21,12 +21,14 @@ public class WiremockEventContext extends EventContext {
     private final String wiremockFilesDir;
     private final String wiremockUrl;
     private final boolean useProxy;
+    private final boolean continueOnUploadError;
 
-    protected WiremockEventContext(EventContext context, String wiremockFilesDir, String wiremockUrl, boolean useProxy) {
-        super(context, WiremockEventFactory.class.getName(), false);
+    protected WiremockEventContext(EventContext context, String wiremockFilesDir, String wiremockUrl, boolean useProxy, boolean continueOnUploadError) {
+        super(context, WiremockEventFactory.class.getName());
         this.wiremockFilesDir = wiremockFilesDir;
         this.wiremockUrl = wiremockUrl;
         this.useProxy = useProxy;
+        this.continueOnUploadError = continueOnUploadError;
     }
 
     public String getWiremockFilesDir() {
@@ -41,12 +43,41 @@ public boolean isUseProxy() {
         return useProxy;
     }
 
+    public boolean isContinueOnUploadError() {
+        return continueOnUploadError;
+    }
+
     @Override
     public String toString() {
         return "WiremockEventConfig{" +
             "wiremockFilesDir='" + wiremockFilesDir + '\'' +
             ", wiremockUrl='" + wiremockUrl + '\'' +
             ", useProxy=" + useProxy +
+            ", continueOnUploadError=" + continueOnUploadError +
             "} " + super.toString();
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+
+        WiremockEventContext that = (WiremockEventContext) o;
+
+        if (useProxy != that.useProxy) return false;
+        if (continueOnUploadError != that.continueOnUploadError) return false;
+        if (!wiremockFilesDir.equals(that.wiremockFilesDir)) return false;
+        return wiremockUrl.equals(that.wiremockUrl);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + wiremockFilesDir.hashCode();
+        result = 31 * result + wiremockUrl.hashCode();
+        result = 31 * result + (useProxy ? 1 : 0);
+        result = 31 * result + (continueOnUploadError ? 1 : 0);
+        return result;
+    }
 }