From e2ec14a170ee024499d6f6c4c38d65650d6fc650 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Tue, 28 Jan 2025 12:26:58 -0500 Subject: [PATCH] spotless:apply --- .../operator/utils/JavaOptsAppend.java | 28 +++++++--------- .../operator/unit/JavaOptsAppendTest.java | 33 ++++++++++++------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/operator/controller/src/main/java/io/apicurio/registry/operator/utils/JavaOptsAppend.java b/operator/controller/src/main/java/io/apicurio/registry/operator/utils/JavaOptsAppend.java index b6a29334fe..205071e127 100644 --- a/operator/controller/src/main/java/io/apicurio/registry/operator/utils/JavaOptsAppend.java +++ b/operator/controller/src/main/java/io/apicurio/registry/operator/utils/JavaOptsAppend.java @@ -8,18 +8,17 @@ import java.util.TreeSet; /** - * Models the value of the JAVA_OPTS_APPEND environment variable. This is - * a convenient way to merge values and handle conflicts. + * Models the value of the JAVA_OPTS_APPEND environment variable. This is a convenient way to merge values and + * handle conflicts. */ public class JavaOptsAppend { private final Set opts = new TreeSet<>(); /** - * Called to set the initial value of the ENV var using an existing - * value, typically configured in the "env" section of the CR. This - * will be a value set by the app deployer, with runtime options - * they want to have enabled. + * Called to set the initial value of the ENV var using an existing value, typically configured in the + * "env" section of the CR. This will be a value set by the app deployer, with runtime options they want + * to have enabled. */ public void setOptsFromEnvVar(String value) { opts.clear(); @@ -33,16 +32,13 @@ public void setOptsFromEnvVar(String value) { */ public EnvVar toEnvVar() { EnvVarBuilder builder = new EnvVarBuilder(); - return builder - .withName(EnvironmentVariables.JAVA_OPTS_APPEND) - .withValue(String.join(" ", opts)) + return builder.withName(EnvironmentVariables.JAVA_OPTS_APPEND).withValue(String.join(" ", opts)) .build(); } /** - * Add another option. If the option already exists, do nothing. Whether the - * option already exists may depend on the option. Custom logic may be needed - * to properly support certain options. + * Add another option. If the option already exists, do nothing. Whether the option already exists may + * depend on the option. Custom logic may be needed to properly support certain options. */ public void addOpt(String optValue) { if (!containsOpt(optValue)) { @@ -58,8 +54,8 @@ public boolean isEmpty() { } /** - * Returns 'true' if the option already exists. The logic for whether an option - * already exists depends on the option. + * Returns 'true' if the option already exists. The logic for whether an option already exists depends on + * the option. */ public boolean containsOpt(String optValue) { if (optValue == null || optValue.trim().isEmpty()) { @@ -93,8 +89,8 @@ public boolean containsOptByPrefix(String prefix) { /** * Checks if an option of one of the following form exists already: * * Looks for another option with the same name but potentially different value. */ diff --git a/operator/controller/src/test/java/io/apicurio/registry/operator/unit/JavaOptsAppendTest.java b/operator/controller/src/test/java/io/apicurio/registry/operator/unit/JavaOptsAppendTest.java index 9992986a80..0982279c62 100644 --- a/operator/controller/src/test/java/io/apicurio/registry/operator/unit/JavaOptsAppendTest.java +++ b/operator/controller/src/test/java/io/apicurio/registry/operator/unit/JavaOptsAppendTest.java @@ -12,7 +12,8 @@ public void testJavaOpts_Empty() throws Exception { JavaOptsAppend optsAppend = new JavaOptsAppend(); Assertions.assertThat(optsAppend.isEmpty()).isTrue(); Assertions.assertThat(optsAppend.toEnvVar()).isNotNull(); - Assertions.assertThat(optsAppend.toEnvVar().getName()).isEqualTo(EnvironmentVariables.JAVA_OPTS_APPEND); + Assertions.assertThat(optsAppend.toEnvVar().getName()) + .isEqualTo(EnvironmentVariables.JAVA_OPTS_APPEND); Assertions.assertThat(optsAppend.toEnvVar().getValue()).isEqualTo(""); } @@ -22,7 +23,8 @@ public void testJavaOpts_EmptyEnvVar() throws Exception { optsAppend.setOptsFromEnvVar(""); Assertions.assertThat(optsAppend.isEmpty()).isTrue(); Assertions.assertThat(optsAppend.toEnvVar()).isNotNull(); - Assertions.assertThat(optsAppend.toEnvVar().getName()).isEqualTo(EnvironmentVariables.JAVA_OPTS_APPEND); + Assertions.assertThat(optsAppend.toEnvVar().getName()) + .isEqualTo(EnvironmentVariables.JAVA_OPTS_APPEND); Assertions.assertThat(optsAppend.toEnvVar().getValue()).isEqualTo(""); } @@ -32,8 +34,10 @@ public void testJavaOpts_EnvVar() throws Exception { optsAppend.setOptsFromEnvVar("-Xms512m -Xmx1g -XX:+UseG1GC -Dspring.profiles.active=prod"); Assertions.assertThat(optsAppend.isEmpty()).isFalse(); Assertions.assertThat(optsAppend.toEnvVar()).isNotNull(); - Assertions.assertThat(optsAppend.toEnvVar().getName()).isEqualTo(EnvironmentVariables.JAVA_OPTS_APPEND); - Assertions.assertThat(optsAppend.toEnvVar().getValue()).isEqualTo("-Dspring.profiles.active=prod -XX:+UseG1GC -Xms512m -Xmx1g"); + Assertions.assertThat(optsAppend.toEnvVar().getName()) + .isEqualTo(EnvironmentVariables.JAVA_OPTS_APPEND); + Assertions.assertThat(optsAppend.toEnvVar().getValue()) + .isEqualTo("-Dspring.profiles.active=prod -XX:+UseG1GC -Xms512m -Xmx1g"); } @Test @@ -44,8 +48,10 @@ public void testJavaOpts_EnvVarWithAdds() throws Exception { optsAppend.addOpt("-Dspring.profiles.active=prod"); Assertions.assertThat(optsAppend.isEmpty()).isFalse(); Assertions.assertThat(optsAppend.toEnvVar()).isNotNull(); - Assertions.assertThat(optsAppend.toEnvVar().getName()).isEqualTo(EnvironmentVariables.JAVA_OPTS_APPEND); - Assertions.assertThat(optsAppend.toEnvVar().getValue()).isEqualTo("-Dspring.profiles.active=prod -XX:+UseG1GC -Xms512m -Xmx1g"); + Assertions.assertThat(optsAppend.toEnvVar().getName()) + .isEqualTo(EnvironmentVariables.JAVA_OPTS_APPEND); + Assertions.assertThat(optsAppend.toEnvVar().getValue()) + .isEqualTo("-Dspring.profiles.active=prod -XX:+UseG1GC -Xms512m -Xmx1g"); } @Test @@ -67,7 +73,8 @@ public void testJavaOpts_ParamConflict() throws Exception { optsAppend.addOpt("-XX:+HeapDumpOnOutOfMemoryError"); optsAppend.addOpt("-XX:HeapDumpPath=/path/to/dumps/"); optsAppend.addOpt("-XX:HeapDumpPath=/path/to/other-dumps/"); - Assertions.assertThat(optsAppend.toEnvVar().getValue()).isEqualTo("-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/path/to/dumps/ -XX:ReservedCodeCacheSize=128m"); + Assertions.assertThat(optsAppend.toEnvVar().getValue()).isEqualTo( + "-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/path/to/dumps/ -XX:ReservedCodeCacheSize=128m"); optsAppend = new JavaOptsAppend(); optsAppend.setOptsFromEnvVar("-XX:ReservedCodeCacheSize=128m -XX:+HeapDumpOnOutOfMemoryError"); @@ -75,13 +82,15 @@ public void testJavaOpts_ParamConflict() throws Exception { optsAppend.addOpt("-XX:+HeapDumpOnOutOfMemoryError"); optsAppend.addOpt("-XX:HeapDumpPath=/path/to/dumps/"); optsAppend.addOpt("-XX:HeapDumpPath=/path/to/other-dumps/"); - Assertions.assertThat(optsAppend.toEnvVar().getValue()).isEqualTo("-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/path/to/dumps/ -XX:ReservedCodeCacheSize=128m"); + Assertions.assertThat(optsAppend.toEnvVar().getValue()).isEqualTo( + "-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/path/to/dumps/ -XX:ReservedCodeCacheSize=128m"); } @Test public void testJavaOpts_Conflicts() throws Exception { JavaOptsAppend optsAppend = new JavaOptsAppend(); - optsAppend.setOptsFromEnvVar("-Xms512m -Xmx1g -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"); + optsAppend.setOptsFromEnvVar( + "-Xms512m -Xmx1g -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"); optsAppend.addOpt("-Xms256m"); optsAppend.addOpt("-Xmx2g"); optsAppend.addOpt("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:12345"); @@ -89,8 +98,10 @@ public void testJavaOpts_Conflicts() throws Exception { optsAppend.addOpt("-javaagent:/path/to/alt_agent.jar"); Assertions.assertThat(optsAppend.isEmpty()).isFalse(); Assertions.assertThat(optsAppend.toEnvVar()).isNotNull(); - Assertions.assertThat(optsAppend.toEnvVar().getName()).isEqualTo(EnvironmentVariables.JAVA_OPTS_APPEND); - Assertions.assertThat(optsAppend.toEnvVar().getValue()).isEqualTo("-Xms512m -Xmx1g -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -javaagent:/path/to/agent.jar"); + Assertions.assertThat(optsAppend.toEnvVar().getName()) + .isEqualTo(EnvironmentVariables.JAVA_OPTS_APPEND); + Assertions.assertThat(optsAppend.toEnvVar().getValue()).isEqualTo( + "-Xms512m -Xmx1g -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -javaagent:/path/to/agent.jar"); } }