[ARQ-2230] Resolve incorrectly placed left curly bracket

arquillian · Mar 7, 2024 · ec818b9 · ec818b9
1 parent 50c2d01
commit ec818b9
Show file tree

Hide file tree

Showing 31 changed files with 53 additions and 119 deletions.
diff --git a/...base/src/main/java/org/jboss/arquillian/config/impl/extension/StringPropertyReplacer.java b/...base/src/main/java/org/jboss/arquillian/config/impl/extension/StringPropertyReplacer.java
@@ -153,8 +153,7 @@ else if (c == '}' && state == IN_BRACKET) {
                 // No content
                 if (start + 2 == i) {
                     buffer.append("${}"); // REVIEW: Correct?
-                } else // Collect the system property
-                {
+                } else { // Collect the system property
                     String value;
 
                     String key = string.substring(start + 2, i);

diff --git a/...r/impl-base/src/main/java/org/jboss/arquillian/container/impl/FilteredURLClassLoader.java b/...r/impl-base/src/main/java/org/jboss/arquillian/container/impl/FilteredURLClassLoader.java
@@ -43,8 +43,7 @@ public java.lang.Class<?> loadClass(String name, boolean resolve) throws ClassNo
                     c = super.findClass(name);
                 }
             }
-            if (c != null) // class found locally
-            {
+            if (c != null) { // class found locally
                 return c;
             }
         }

diff --git a/container/impl-base/src/main/java/org/jboss/arquillian/container/impl/SecurityActions.java b/container/impl-base/src/main/java/org/jboss/arquillian/container/impl/SecurityActions.java
@@ -324,9 +324,7 @@ private static Collection<Method> filterBridgeMethods(Method... declaredMethods)
     /**
      * Single instance to get the TCCL
      */
-    private enum GetTcclAction implements PrivilegedAction<ClassLoader>
-
-    {
+    private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
         INSTANCE;
 
         public ClassLoader run() {

diff --git a/...e/src/main/java/org/jboss/arquillian/container/impl/client/container/SecurityActions.java b/...e/src/main/java/org/jboss/arquillian/container/impl/client/container/SecurityActions.java
@@ -324,9 +324,7 @@ private static Collection<Method> filterBridgeMethods(Method... declaredMethods)
     /**
      * Single instance to get the TCCL
      */
-    private enum GetTcclAction implements PrivilegedAction<ClassLoader>
-
-    {
+    private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
         INSTANCE;
 
         public ClassLoader run() {

diff --git a/.../src/main/java/org/jboss/arquillian/container/impl/client/deployment/SecurityActions.java b/.../src/main/java/org/jboss/arquillian/container/impl/client/deployment/SecurityActions.java
@@ -324,9 +324,7 @@ private static Collection<Method> filterBridgeMethods(Method... declaredMethods)
     /**
      * Single instance to get the TCCL
      */
-    private enum GetTcclAction implements PrivilegedAction<ClassLoader>
-
-    {
+    private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
         INSTANCE;
 
         public ClassLoader run() {

diff --git a/...est-impl-base/src/main/java/org/jboss/arquillian/container/test/impl/SecurityActions.java b/...est-impl-base/src/main/java/org/jboss/arquillian/container/test/impl/SecurityActions.java
@@ -324,9 +324,7 @@ private static Collection<Method> filterBridgeMethods(Method... declaredMethods)
     /**
      * Single instance to get the TCCL
      */
-    private enum GetTcclAction implements PrivilegedAction<ClassLoader>
-
-    {
+    private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
         INSTANCE;
 
         public ClassLoader run() {

diff --git a/...quillian/container/test/impl/client/deployment/tool/ArchiveDeploymentToolingExporter.java b/...quillian/container/test/impl/client/deployment/tool/ArchiveDeploymentToolingExporter.java
@@ -36,8 +36,7 @@ public class ArchiveDeploymentToolingExporter {
 
     public void export(@Observes BeforeDeploy event) throws Exception {
         String deploymentOutputFolder = System.getProperty(ARQUILLIAN_TOOLING_DEPLOYMENT_FOLDER);
-        if (deploymentOutputFolder == null) // tooling not activated, nothing to do
-        {
+        if (deploymentOutputFolder == null) { // tooling not activated, nothing to do
             return;
         }
         Archive<?> deployment = event.getDeployment().getTestableArchive(); // deployment not in context?, nothing to do

diff --git a/.../test-spi/src/main/java/org/jboss/arquillian/container/test/spi/util/SecurityActions.java b/.../test-spi/src/main/java/org/jboss/arquillian/container/test/spi/util/SecurityActions.java
@@ -324,9 +324,7 @@ private static Collection<Method> filterBridgeMethods(Method... declaredMethods)
     /**
      * Single instance to get the TCCL
      */
-    private enum GetTcclAction implements PrivilegedAction<ClassLoader>
-
-    {
+    private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
         INSTANCE;
 
         public ClassLoader run() {

diff --git a/core/impl-base/src/main/java/org/jboss/arquillian/core/impl/ManagerImpl.java b/core/impl-base/src/main/java/org/jboss/arquillian/core/impl/ManagerImpl.java
@@ -345,8 +345,7 @@ void fireException(Throwable event) {
         runtimeLogger.debug(event, true);
         try {
             List<ObserverMethod> observers = resolveObservers(event.getClass());
-            if (observers.size() == 0) // no one is handling this Exception, throw it out.
-            {
+            if (observers.size() == 0) { // no one is handling this Exception, throw it out.
                 UncheckedThrow.throwUnchecked(event);
             }
             for (int i = 0; i < observers.size(); i++) {

diff --git a/core/impl-base/src/main/java/org/jboss/arquillian/core/impl/SecurityActions.java b/core/impl-base/src/main/java/org/jboss/arquillian/core/impl/SecurityActions.java
@@ -324,14 +324,12 @@ private static Collection<Method> filterBridgeMethods(Method... declaredMethods)
     /**
      * Single instance to get the TCCL
      */
-    private enum GetTcclAction implements PrivilegedAction<ClassLoader>
-
-    {
+    private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
         INSTANCE;
 
         public ClassLoader run() {
             return Thread.currentThread().getContextClassLoader();
         }
 
     }
-}
+}
diff --git a/core/impl-base/src/main/java/org/jboss/arquillian/core/impl/loadable/SecurityActions.java b/core/impl-base/src/main/java/org/jboss/arquillian/core/impl/loadable/SecurityActions.java
@@ -329,14 +329,12 @@ private static Collection<Method> filterBridgeMethods(Method... declaredMethods)
     /**
      * Single instance to get the TCCL
      */
-    private enum GetTcclAction implements PrivilegedAction<ClassLoader>
-
-    {
+    private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
         INSTANCE;
 
         public ClassLoader run() {
             return Thread.currentThread().getContextClassLoader();
         }
 
     }
-}
+}
diff --git a/core/spi/src/main/java/org/jboss/arquillian/core/spi/SecurityActions.java b/core/spi/src/main/java/org/jboss/arquillian/core/spi/SecurityActions.java
@@ -324,14 +324,12 @@ private static Collection<Method> filterBridgeMethods(Method... declaredMethods)
     /**
      * Single instance to get the TCCL
      */
-    private enum GetTcclAction implements PrivilegedAction<ClassLoader>
-
-    {
+    private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
         INSTANCE;
 
         public ClassLoader run() {
             return Thread.currentThread().getContextClassLoader();
         }
 
     }
-}
+}
diff --git a/junit/container/src/test/java/org/jboss/arquillian/junit/container/JUnitTestBaseClass.java b/junit/container/src/test/java/org/jboss/arquillian/junit/container/JUnitTestBaseClass.java
@@ -127,9 +127,7 @@ private void setAdaptor(TestRunnerAdaptor adaptor) throws Exception {
         method.invoke(null, adaptor);
     }
 
-    public enum Cycle
-
-    {
+    public enum Cycle {
         BEFORE_CLASS_RULE, BEFORE_RULE, BEFORE_CLASS, BEFORE, TEST, AFTER, AFTER_CLASS, AFTER_RULE, AFTER_CLASS_RULE;
     }
 

diff --git a/junit/core/src/main/java/org/jboss/arquillian/junit/SecurityActions.java b/junit/core/src/main/java/org/jboss/arquillian/junit/SecurityActions.java
@@ -347,14 +347,12 @@ private static Collection<Method> filterBridgeMethods(Method... declaredMethods)
     /**
      * Single instance to get the TCCL
      */
-    private enum GetTcclAction implements PrivilegedAction<ClassLoader>
-
-    {
+    private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
         INSTANCE;
 
         public ClassLoader run() {
             return Thread.currentThread().getContextClassLoader();
         }
 
     }
-}
+}
diff --git a/.../core/src/test/java/org/jboss/arquillian/junit/ClassWithArquillianClassAndMethodRule.java b/.../core/src/test/java/org/jboss/arquillian/junit/ClassWithArquillianClassAndMethodRule.java
@@ -11,41 +11,35 @@
 
 import static org.jboss.arquillian.junit.JUnitTestBaseClass.wasCalled;
 
-public class ClassWithArquillianClassAndMethodRule
-{
+public class ClassWithArquillianClassAndMethodRule {
    @ClassRule
    public static ArquillianTestClass arquillianTestClass = new ArquillianTestClass();
 
    @Rule
    public ArquillianTest arquillianTest = new ArquillianTest();
 
    @BeforeClass
-   public static void beforeClass() throws Throwable
-   {
+   public static void beforeClass() throws Throwable {
       wasCalled(Cycle.BEFORE_CLASS);
    }
 
    @AfterClass
-   public static void afterClass() throws Throwable
-   {
+   public static void afterClass() throws Throwable {
       wasCalled(Cycle.AFTER_CLASS);
    }
 
    @Before
-   public void before() throws Throwable
-   {
+   public void before() throws Throwable {
       wasCalled(Cycle.BEFORE);
    }
 
    @After
-   public void after() throws Throwable
-   {
+   public void after() throws Throwable {
       wasCalled(Cycle.AFTER);
    }
 
    @Test
-   public void shouldBeInvoked() throws Throwable
-   {
+   public void shouldBeInvoked() throws Throwable {
       wasCalled(Cycle.TEST);
    }
 }
diff --git a/...rg/jboss/arquillian/junit/ClassWithArquillianClassAndMethodRuleWithExpectedException.java b/...rg/jboss/arquillian/junit/ClassWithArquillianClassAndMethodRuleWithExpectedException.java
@@ -11,41 +11,35 @@
 
 import static org.jboss.arquillian.junit.JUnitTestBaseClass.wasCalled;
 
-public class ClassWithArquillianClassAndMethodRuleWithExpectedException
-{
+public class ClassWithArquillianClassAndMethodRuleWithExpectedException {
    @ClassRule
    public static ArquillianTestClass arquillianTestClass = new ArquillianTestClass();
 
    @Rule
    public ArquillianTest arquillianTest = new ArquillianTest();
 
    @BeforeClass
-   public static void beforeClass() throws Throwable
-   {
+   public static void beforeClass() throws Throwable {
       wasCalled(Cycle.BEFORE_CLASS);
    }
 
    @AfterClass
-   public static void afterClass() throws Throwable
-   {
+   public static void afterClass() throws Throwable {
       wasCalled(Cycle.AFTER_CLASS);
    }
 
    @Before
-   public void before() throws Throwable
-   {
+   public void before() throws Throwable {
       wasCalled(Cycle.BEFORE);
    }
 
    @After
-   public void after() throws Throwable
-   {
+   public void after() throws Throwable {
       wasCalled(Cycle.AFTER);
    }
 
    @Test(expected = IllegalArgumentException.class)
-   public void shouldBeInvoked() throws Throwable
-   {
+   public void shouldBeInvoked() throws Throwable {
       wasCalled(Cycle.TEST);
       throw new IllegalArgumentException();
    }

diff --git a/junit/core/src/test/java/org/jboss/arquillian/junit/ClassWithArquillianRunner.java b/junit/core/src/test/java/org/jboss/arquillian/junit/ClassWithArquillianRunner.java
@@ -30,8 +30,7 @@
 public class ClassWithArquillianRunner {
 
    @BeforeClass
-   public static void beforeClass() throws Throwable
-   {
+   public static void beforeClass() throws Throwable {
       wasCalled(Cycle.BEFORE_CLASS);
    }
 

diff --git a/.../test/java/org/jboss/arquillian/junit/ClassWithArquillianRunnerWithExpectedException.java b/.../test/java/org/jboss/arquillian/junit/ClassWithArquillianRunnerWithExpectedException.java
@@ -27,35 +27,29 @@
 import static org.jboss.arquillian.junit.JUnitTestBaseClass.wasCalled;
 
 @RunWith(Arquillian.class)
-public class ClassWithArquillianRunnerWithExpectedException
-{
+public class ClassWithArquillianRunnerWithExpectedException {
    @BeforeClass
-   public static void beforeClass() throws Throwable
-   {
+   public static void beforeClass() throws Throwable {
       wasCalled(Cycle.BEFORE_CLASS);
    }
 
    @AfterClass
-   public static void afterClass() throws Throwable
-   {
+   public static void afterClass() throws Throwable {
       wasCalled(Cycle.AFTER_CLASS);
    }
 
    @Before
-   public void before() throws Throwable
-   {
+   public void before() throws Throwable {
       wasCalled(Cycle.BEFORE);
    }
 
    @After
-   public void after() throws Throwable
-   {
+   public void after() throws Throwable {
       wasCalled(Cycle.AFTER);
    }
 
    @Test(expected = IllegalArgumentException.class)
-   public void shouldBeInvoked() throws Throwable
-   {
+   public void shouldBeInvoked() throws Throwable {
       wasCalled(Cycle.TEST);
       throw new IllegalArgumentException();
    }

diff --git a/junit/core/src/test/java/org/jboss/arquillian/junit/InitializationExceptionTestCase.java b/junit/core/src/test/java/org/jboss/arquillian/junit/InitializationExceptionTestCase.java
@@ -38,11 +38,9 @@
  * @version $Revision: $
  */
 @RunWith(MockitoJUnitRunner.class)
-public class InitializationExceptionTestCase extends JUnitTestBaseClass
-{
+public class InitializationExceptionTestCase extends JUnitTestBaseClass {
    @Test
-   public void shouldKeepInitializationExceptionBetweenTestCases() throws Exception
-   {
+   public void shouldKeepInitializationExceptionBetweenTestCases() throws Exception {
       String exceptionMessage = "TEST_EXCEPTION_BEFORE_SUITE_FAILING";
       TestRunnerAdaptor adaptor = mock(TestRunnerAdaptor.class);
       doThrow(new Exception(exceptionMessage)).when(adaptor).beforeSuite();

diff --git a/junit/core/src/test/java/org/jboss/arquillian/junit/JUnitTestBaseClass.java b/junit/core/src/test/java/org/jboss/arquillian/junit/JUnitTestBaseClass.java
@@ -131,9 +131,7 @@ private void setAdaptor(TestRunnerAdaptor adaptor) throws Exception {
         method.invoke(null, adaptor);
     }
 
-    public enum Cycle
-
-    {
+    public enum Cycle {
         BEFORE_CLASS_RULE, BEFORE_RULE, BEFORE_CLASS, BEFORE, TEST, AFTER, AFTER_CLASS, AFTER_RULE, AFTER_CLASS_RULE;
 
         public static Cycle[] basics() {

diff --git a/junit/standalone/src/test/java/org/jboss/arquillian/junit/JUnitTestBaseClass.java b/junit/standalone/src/test/java/org/jboss/arquillian/junit/JUnitTestBaseClass.java
@@ -126,9 +126,7 @@ private void setAdaptor(TestRunnerAdaptor adaptor) throws Exception {
         method.invoke(null, adaptor);
     }
 
-    public enum Cycle
-
-    {
+    public enum Cycle {
         BEFORE_CLASS, BEFORE, TEST, AFTER, AFTER_CLASS
     }
 

diff --git a/...s/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/runner/SecurityActions.java b/...s/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/runner/SecurityActions.java
@@ -324,9 +324,7 @@ private static Collection<Method> filterBridgeMethods(Method... declaredMethods)
     /**
      * Single instance to get the TCCL
      */
-    private enum GetTcclAction implements PrivilegedAction<ClassLoader>
-
-    {
+    private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
         INSTANCE;
 
         public ClassLoader run() {

diff --git a/...-base/src/main/java/org/jboss/arquillian/test/impl/enricher/resource/SecurityActions.java b/...-base/src/main/java/org/jboss/arquillian/test/impl/enricher/resource/SecurityActions.java
@@ -324,14 +324,12 @@ private static Collection<Method> filterBridgeMethods(Method... declaredMethods)
     /**
      * Single instance to get the TCCL
      */
-    private enum GetTcclAction implements PrivilegedAction<ClassLoader>
-
-    {
+    private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
         INSTANCE;
 
         public ClassLoader run() {
             return Thread.currentThread().getContextClassLoader();
         }
 
     }
-}
+}