This is an automated email from the ASF dual-hosted git repository. kbowers pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-benchmarks.git
commit 2a1a9f3485d604fdafc1d25d67ee0c841b321611 Author: Marián Macik <[email protected]> AuthorDate: Tue Jun 8 20:06:08 2021 +0200 Incorporate PR review suggestions --- .../org/kie/kogito/benchmarks/framework/App.java | 18 +++++------ .../kie/kogito/benchmarks/framework/Commands.java | 36 +++++++--------------- .../kogito/benchmarks/AbstractTemplateTest.java | 2 +- 3 files changed, 21 insertions(+), 35 deletions(-) diff --git a/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/App.java b/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/App.java index ce16304..70c83c7 100644 --- a/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/App.java +++ b/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/App.java @@ -14,11 +14,11 @@ import org.apache.commons.lang3.StringUtils; import static org.kie.kogito.benchmarks.framework.Commands.APPS_DIR; public enum App { - SMARTHOUSE_02_QUARKUS_JVM("smarthouse-02-dm-quarkus", MvnCmds.QUARKUS_JVM, URLContent.SMARTHOUSE_02, WhitelistLogLines.EVERYTHING), - SMARTHOUSE_03_QUARKUS_JVM("smarthouse-03-dm-quarkus", MvnCmds.QUARKUS_JVM, URLContent.SMARTHOUSE_03, WhitelistLogLines.EVERYTHING), + SMARTHOUSE_02_QUARKUS_JVM("smarthouse-02-quarkus", MvnCmds.QUARKUS_JVM, URLContent.SMARTHOUSE_02, WhitelistLogLines.EVERYTHING), + SMARTHOUSE_03_QUARKUS_JVM("smarthouse-03-quarkus", MvnCmds.QUARKUS_JVM, URLContent.SMARTHOUSE_03, WhitelistLogLines.EVERYTHING), - SMARTHOUSE_02_SPRING_BOOT("smarthouse-02-dm-springboot", MvnCmds.SPRING_BOOT_JVM, URLContent.SMARTHOUSE_02, WhitelistLogLines.EVERYTHING), - SMARTHOUSE_03_SPRING_BOOT("smarthouse-03-dm-springboot", MvnCmds.SPRING_BOOT_JVM, URLContent.SMARTHOUSE_03, WhitelistLogLines.EVERYTHING); + SMARTHOUSE_02_SPRING_BOOT("smarthouse-02-springboot", MvnCmds.SPRING_BOOT_JVM, URLContent.SMARTHOUSE_02, WhitelistLogLines.EVERYTHING), + SMARTHOUSE_03_SPRING_BOOT("smarthouse-03-springboot", MvnCmds.SPRING_BOOT_JVM, URLContent.SMARTHOUSE_03, WhitelistLogLines.EVERYTHING); public final String dir; public final MvnCmds mavenCommands; @@ -32,11 +32,11 @@ public enum App { this.urlContent = urlContent; this.whitelistLogLines = whitelistLogLines; - String tpFilePath = "/" + dir + "/threshold.properties"; - URL tpFile = Optional.ofNullable(App.class.getResource(tpFilePath)) - .orElseThrow(() -> new RuntimeException("Couldn't find " + tpFilePath)); + String propertiesFilePath = "/" + dir + "/threshold.properties"; + URL propertiesFile = Optional.ofNullable(App.class.getResource(propertiesFilePath)) + .orElseThrow(() -> new RuntimeException("Couldn't find " + propertiesFilePath)); String appDirNormalized = dir.toUpperCase().replace('-', '_') + "_"; - try (InputStream input = tpFile.openStream()) { + try (InputStream input = propertiesFile.openStream()) { Properties props = new Properties(); props.load(input); for (String pn : props.stringPropertyNames()) { @@ -55,7 +55,7 @@ public enum App { throw new IllegalArgumentException("Check threshold.properties and Sys and Env variables (upper case, underscores instead of dots). " + "All values are expected to be of type long."); } catch (IOException e) { - throw new RuntimeException("Couldn't read " + tpFilePath); + throw new RuntimeException("Couldn't read " + propertiesFilePath); } } diff --git a/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/Commands.java b/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/Commands.java index e57f32c..fc6c5dd 100644 --- a/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/Commands.java +++ b/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/Commands.java @@ -47,20 +47,6 @@ public class Commands { private static final Pattern quarkusVersionPattern = Pattern.compile("[ \t]*<quarkus.version>([^<]*)</quarkus.version>.*"); private static final Pattern trailingSlash = Pattern.compile("/+$"); - public static String getArtifactGeneBaseDir() { - for (String p : new String[] { "ARTIFACT_GENERATOR_WORKSPACE", "artifact.generator.workspace" }) { - String env = System.getenv().get(p); - if (StringUtils.isNotBlank(env)) { - return env; - } - String sys = System.getProperty(p); - if (StringUtils.isNotBlank(sys)) { - return sys; - } - } - return System.getProperty("java.io.tmpdir"); - } - public static String getLocalMavenRepoDir() { for (String p : new String[] { "TESTS_MAVEN_REPO_LOCAL", "tests.maven.repo.local" }) { String env = System.getenv().get(p); @@ -78,7 +64,7 @@ public class Commands { return mainBuildRepo; } - return System.getProperty("user.home") + File.separator + ".m2" + File.separator + "repository"; + return Path.of(System.getProperty("user.home"), ".m2", "repository").toString(); } /** @@ -120,8 +106,8 @@ public class Commands { return sys; } } - String failure = "Failed to determine quarkus.version. Check pom.xm, check env and sys vars QUARKUS_VERSION"; - try (Scanner sc = new Scanner(new File(getBaseDir() + File.separator + "pom.xml"), StandardCharsets.UTF_8)) { + String failure = "Failed to determine quarkus.version. Check pom.xml, check env and sys vars QUARKUS_VERSION"; + try (Scanner sc = new Scanner(Path.of(getBaseDir(), "pom.xml"), StandardCharsets.UTF_8)) { while (sc.hasNextLine()) { String line = sc.nextLine(); Matcher m = quarkusVersionPattern.matcher(line); @@ -159,8 +145,8 @@ public class Commands { } public static void cleanTarget(App app) { - String target = APPS_DIR + File.separator + app.dir + File.separator + "target"; - String logs = APPS_DIR + File.separator + app.dir + File.separator + "logs"; + Path target = Path.of(APPS_DIR, app.dir, "target"); + Path logs = Path.of(APPS_DIR, app.dir, "logs"); cleanDirOrFile(target, logs); } @@ -222,15 +208,15 @@ public class Commands { Assertions.assertThat(p.exitValue()).isEqualTo(0); } - public static void cleanDirOrFile(String... path) { - for (String s : path) { + public static void cleanDirOrFile(Path... paths) { + for (Path path : paths) { try { - Files.walk(Paths.get(s)) + Files.walk(path) .sorted(Comparator.reverseOrder()) .map(Path::toFile) .forEach(File::delete); } catch (IOException e) { - logger.warn("Unable to delete directories or files", e); + throw new RuntimeException("Unable to delete directories or files", e); } } } @@ -287,8 +273,8 @@ public class Commands { // TODO this may be useful in the future public static void adjustPrettyPrintForJsonLogging(String appDir) throws IOException { - Path appProps = Paths.get(appDir + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + "application.properties"); - Path appYaml = Paths.get(appDir + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + "application.yml"); + Path appProps = Path.of(appDir, "src", "main", "resources", "application.properties"); + Path appYaml = Path.of(appDir, "src", "main", "resources", "application.yml"); adjustFileContent(appProps, "quarkus.log.console.json.pretty-print=true", "quarkus.log.console.json.pretty-print=false"); adjustFileContent(appYaml, "pretty-print: true", "pretty-print: fase"); diff --git a/kogito-benchmarks-tests/src/test/java/org/kie/kogito/benchmarks/AbstractTemplateTest.java b/kogito-benchmarks-tests/src/test/java/org/kie/kogito/benchmarks/AbstractTemplateTest.java index e5b299d..2b88f7f 100644 --- a/kogito-benchmarks-tests/src/test/java/org/kie/kogito/benchmarks/AbstractTemplateTest.java +++ b/kogito-benchmarks-tests/src/test/java/org/kie/kogito/benchmarks/AbstractTemplateTest.java @@ -70,7 +70,7 @@ public abstract class AbstractTemplateTest { try { // Cleanup cleanTarget(app); - Files.createDirectories(Paths.get(appDir.getAbsolutePath() + File.separator + "logs")); + Files.createDirectories(Path.of(appDir.getAbsolutePath(), "logs")); // Build first time to download dependencies BuildResult buildResult = buildApp(app, mn, cn, whatIDidReport); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
