aboutsummaryrefslogtreecommitdiffstats
path: root/validate/sample-mock-generator/src/main/java
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-10-26 19:36:45 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-10-26 19:56:43 +0530
commitef7de3edf23a0c6fba6e6fb3e175798adc532d78 (patch)
tree56ec5aae3b083acc147c9137ab2733caddef6bc8 /validate/sample-mock-generator/src/main/java
parentb0d8aa12fe8f88059f7fcce741913194d72d0d69 (diff)
Fix the sample file name align with schema
CLI-55 Change-Id: I84533921d6a2bbfd818e0c68b723d6f131a21b2c Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'validate/sample-mock-generator/src/main/java')
-rw-r--r--validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockJsonGenerator.java5
-rw-r--r--validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockResponse.java2
2 files changed, 2 insertions, 5 deletions
diff --git a/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockJsonGenerator.java b/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockJsonGenerator.java
index c3006e32..4b2e116c 100644
--- a/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockJsonGenerator.java
+++ b/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockJsonGenerator.java
@@ -17,9 +17,7 @@ package org.onap.cli.http.mock;
import java.io.File;
import java.io.IOException;
-import java.text.SimpleDateFormat;
import java.util.Arrays;
-import java.util.Date;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -35,8 +33,7 @@ public class MockJsonGenerator {
ObjectMapper mapper = new ObjectMapper();
ObjectWriter writer = mapper.writer(new DefaultPrettyPrinter());
- String timeStamp = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(new Date());
- writer.writeValue(new File(jsonFilePath + "-" + timeStamp + "-moco.json"),
+ writer.writeValue(new File(jsonFilePath),
Arrays.asList(mockObject));
}
}
diff --git a/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockResponse.java b/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockResponse.java
index 2b8fa826..7e8cdca8 100644
--- a/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockResponse.java
+++ b/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockResponse.java
@@ -38,7 +38,7 @@ public class MockResponse {
}
public void setJson(String json) throws IOException {
- if (!json.isEmpty()) {
+ if (json != null && !json.isEmpty()) {
ObjectMapper objectMapper = new ObjectMapper();
this.json = objectMapper.readTree(json);
}