From af77b67dbdc6312c763350e9413e69aa596ef302 Mon Sep 17 00:00:00 2001 From: Fabio Burzigotti Date: Fri, 17 Jan 2025 12:22:04 +0100 Subject: [PATCH] [issue-122] (Unrelated) - Fix formatting --- .../helm/wildfly/EapHelmChartReleaseAdapterTest.java | 6 ++++-- ...elmChartExistingValuesOpenShiftExampleApplication.java | 8 ++++---- .../WildflyHelmChartOpenShiftExampleApplication.java | 6 ++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/provisioners/src/test/java/org/jboss/intersmash/provision/helm/wildfly/EapHelmChartReleaseAdapterTest.java b/provisioners/src/test/java/org/jboss/intersmash/provision/helm/wildfly/EapHelmChartReleaseAdapterTest.java index 0953d58f..543dd6f5 100644 --- a/provisioners/src/test/java/org/jboss/intersmash/provision/helm/wildfly/EapHelmChartReleaseAdapterTest.java +++ b/provisioners/src/test/java/org/jboss/intersmash/provision/helm/wildfly/EapHelmChartReleaseAdapterTest.java @@ -191,7 +191,8 @@ public void verifyEap81DynamicallyFilledAdapterTest() { Assertions.assertEquals("url", eap81HelmChartRelease.getSourceRepositoryUrl()); Assertions.assertEquals("ref", eap81HelmChartRelease.getSourceRepositoryRef()); Assertions.assertEquals("context-dir", eap81HelmChartRelease.getContextDir()); - Assertions.assertEquals("fp1,fp2", eap81HelmChartRelease.getS2iFeaturePacks().stream().collect(Collectors.joining(","))); + Assertions.assertEquals("fp1,fp2", + eap81HelmChartRelease.getS2iFeaturePacks().stream().collect(Collectors.joining(","))); Assertions.assertEquals("gl1,gl2", eap81HelmChartRelease.getS2iGalleonLayers().stream().collect(Collectors.joining(","))); Assertions.assertEquals("ch1", eap81HelmChartRelease.getS2iChannels().stream().collect(Collectors.joining(","))); @@ -285,7 +286,8 @@ public void verifyWildFlyDynamicallyFilledAdapterTest() { Assertions.assertEquals("url", wildflyHelmChartRelease.getSourceRepositoryUrl()); Assertions.assertEquals("ref", wildflyHelmChartRelease.getSourceRepositoryRef()); Assertions.assertEquals("context-dir", wildflyHelmChartRelease.getContextDir()); - Assertions.assertEquals("fp1,fp2", wildflyHelmChartRelease.getS2iFeaturePacks().stream().collect(Collectors.joining(","))); + Assertions.assertEquals("fp1,fp2", + wildflyHelmChartRelease.getS2iFeaturePacks().stream().collect(Collectors.joining(","))); Assertions.assertEquals("gl1,gl2", wildflyHelmChartRelease.getS2iGalleonLayers().stream().collect(Collectors.joining(","))); Assertions.assertEquals(Boolean.TRUE, wildflyHelmChartRelease.isBuildEnabled()); diff --git a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java index 9150c99b..ffce4454 100644 --- a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java +++ b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java @@ -74,28 +74,28 @@ private HelmChartRelease loadRelease() { } else if (IntersmashTestsuiteProperties.isProductizedTestExecutionProfileEnabled()) { // EAP 8.0 if (TestDeploymentProperties.isEap80DeploymentsBuildStreamEnabled()) { - HelmEap8Release helmRelease = HelmChartReleaseAdapter.fromValuesFile( + HelmEap8Release helmRelease = HelmChartReleaseAdapter. fromValuesFile( this.getClass().getResource("eap8-helm-values.yaml"), HelmEap8Release.class); wildflyHelmChartRelease = new Eap8HelmChartReleaseAdapter(helmRelease) .withJdk17BuilderImage(IntersmashConfig.wildflyImageURL()) .withJdk17RuntimeImage(IntersmashConfig.wildflyRuntimeImageURL()); } // EAP 8.1 else if (TestDeploymentProperties.isEap81DeploymentsBuildStreamEnabled()) { - HelmEap81Release helmRelease = HelmChartReleaseAdapter.fromValuesFile( + HelmEap81Release helmRelease = HelmChartReleaseAdapter. fromValuesFile( this.getClass().getResource("eap81-helm-values.yaml"), HelmEap81Release.class); wildflyHelmChartRelease = new Eap81HelmChartReleaseAdapter(helmRelease) .withJdk17BuilderImage(IntersmashConfig.wildflyImageURL()) .withJdk17RuntimeImage(IntersmashConfig.wildflyRuntimeImageURL()); } // EAP XP 5 else if (TestDeploymentProperties.isEapXp5DeploymentsBuildStreamEnabled()) { - HelmXp5Release helmRelease = HelmChartReleaseAdapter.fromValuesFile( + HelmXp5Release helmRelease = HelmChartReleaseAdapter. fromValuesFile( this.getClass().getResource("xp5-helm-values.yaml"), HelmXp5Release.class); wildflyHelmChartRelease = new EapXp5HelmChartReleaseAdapter(helmRelease) .withJdk17BuilderImage(IntersmashConfig.wildflyImageURL()) .withJdk17RuntimeImage(IntersmashConfig.wildflyRuntimeImageURL()); } // EAP XP 6 else if (TestDeploymentProperties.isEapXp6DeploymentsBuildStreamEnabled()) { - HelmXp6Release helmRelease = HelmChartReleaseAdapter.fromValuesFile( + HelmXp6Release helmRelease = HelmChartReleaseAdapter. fromValuesFile( this.getClass().getResource("xp6-helm-values.yaml"), HelmXp6Release.class); wildflyHelmChartRelease = new EapXp6HelmChartReleaseAdapter(helmRelease) .withJdk17BuilderImage(IntersmashConfig.wildflyImageURL()) diff --git a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java index 5ee34f15..0ed6ec64 100644 --- a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java +++ b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java @@ -60,9 +60,11 @@ public WildflyHelmChartOpenShiftExampleApplication() { } else if (TestDeploymentProperties.isEapXp6DeploymentsBuildStreamEnabled()) { release = loadRelease(new EapXp6HelmChartReleaseAdapter(new HelmXp6Release())); } else - throw new IllegalStateException(String.format("Not a valid WildFly deployments stream! (%s)", TestDeploymentProperties.getWildflyDeploymentsBuildStream())); + throw new IllegalStateException(String.format("Not a valid WildFly deployments stream! (%s)", + TestDeploymentProperties.getWildflyDeploymentsBuildStream())); } else - throw new IllegalStateException(String.format("Not a valid testing profile! (%s)", TestDeploymentProperties.getWildflyDeploymentsBuildProfile())); + throw new IllegalStateException(String.format("Not a valid testing profile! (%s)", + TestDeploymentProperties.getWildflyDeploymentsBuildProfile())); } private HelmChartRelease loadRelease(final WildflyHelmChartRelease release) {