From ef7de3edf23a0c6fba6e6fb3e175798adc532d78 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Thu, 26 Oct 2017 19:36:45 +0530 Subject: Fix the sample file name align with schema CLI-55 Change-Id: I84533921d6a2bbfd818e0c68b723d6f131a21b2c Signed-off-by: Kanagaraj Manickam k00365106 --- .../src/main/java/org/onap/cli/http/mock/MockJsonGenerator.java | 5 +---- .../src/main/java/org/onap/cli/http/mock/MockResponse.java | 2 +- .../main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java | 7 ++++--- .../java/org/onap/cli/sample/yaml/SampleYamlGeneratorTest.java | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) (limited to 'validate') 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); } diff --git a/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java b/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java index 5c308154..eb1c411b 100644 --- a/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java +++ b/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java @@ -16,6 +16,7 @@ package org.onap.cli.sample.yaml; +import java.io.File; import java.io.IOException; import java.io.PrintWriter; import java.util.Arrays; @@ -27,11 +28,11 @@ public class SampleYamlGenerator { static int nTab; public static void generateSampleYaml(List input, String ouput, String version, - String targetFolder, boolean debug) throws IOException { + String targetPath, boolean debug) throws IOException { String cmdName = input.get(0); - PrintWriter writer = new PrintWriter(targetFolder + "/" + cmdName + "-sample.yaml", "UTF-8"); + PrintWriter writer = new PrintWriter(targetPath, "UTF-8"); writeKeyValuePair(writer, "onap_cli_sample_version", "1.0"); writeKeyValuePair(writer, "name", cmdName); writeKeyValuePair(writer, "version", version); @@ -41,7 +42,7 @@ public class SampleYamlGenerator { writeKeyValuePair(writer, "name", cmdName); writeKeyValuePair(writer, "input", input.stream().skip(1).collect(Collectors.joining(" "))); - writeKeyValuePair(writer, "moco", cmdName + "-sample-yaml.yaml"); + writeKeyValuePair(writer, "moco", new File(targetPath).getName().replaceAll("-sample.yaml", "-moco.json")); writeMultilineKeyValue(writer, "ouput", ouput, debug); writeEndKey(); diff --git a/validate/sample-yaml-generator/src/test/java/org/onap/cli/sample/yaml/SampleYamlGeneratorTest.java b/validate/sample-yaml-generator/src/test/java/org/onap/cli/sample/yaml/SampleYamlGeneratorTest.java index c98cb71b..98c0ce9d 100644 --- a/validate/sample-yaml-generator/src/test/java/org/onap/cli/sample/yaml/SampleYamlGeneratorTest.java +++ b/validate/sample-yaml-generator/src/test/java/org/onap/cli/sample/yaml/SampleYamlGeneratorTest.java @@ -26,7 +26,7 @@ public class SampleYamlGeneratorTest { @Test public void testGenerateSampleYaml() throws IOException { SampleYamlGenerator.generateSampleYaml(Arrays.asList("testcmd", "-a", "argument"), - "+--------+\n+val +\n+argument+", "test-version-1.0", "target", false); + "+--------+\n+val +\n+argument+", "test-version-1.0", "target/test.yaml", false); } } -- cgit 1.2.3-korg