Upgrade Wildfly Swarm to Thorntail

Author: juangon

README.md

@@ -38,12 +38,12 @@ These are the available container profiles:
  This profile uses the special "wlp-microProfile1" distribution of Liberty, which contains the MicroProfile APIs out of the box
  and start up the server per sample. 
  Useful for CI servers. The Liberty version that's used can be set via the ``liberty.version`` property.
- * WildFly 
- * ``wildfly-ci-managed``
+ * Thorntail 
+ * ``thorntail``
 
- This profile is based on WildFly Swarm, and includes the MicroProfile 1.2 fragment. The actual WildFly Swarm code and thus
+ This profile is based on Thorntail, and includes the MicroProfile 1.2 fragment. The actual Thorntail code and thus
  the WildFly code is handled internally by the Arquillian connector. 
- Useful for CI servers. The WildFly Swarm version that's used can be set via the ``wildfly.version`` property.
+ Useful for CI servers. The Thorntail version that's used can be set via the ``thorntail.version`` property.
 
 The containers that download and install a server (the \*-ci-managed profiles) allow you to override the version used, e.g.:
 

fault-tolerance/asynchronous/src/main/resources/project-defaults.yml

@@ -0,0 +1,8 @@
+swarm:
+ hystrix:
+ command:
+ default:
+ execution:
+ isolation:
+ thread:
+ timeoutInMilliseconds: 3500 #MORE THAN MyAsyncBean*Level.AWAIT CONFIGURED IN TESTS

fault-tolerance/asynchronous/src/test/java/org/eclipse/microprofile12/faulttolerance/asynchronous/AsyncClassBeanTest.java

@@ -36,7 +36,8 @@ public static WebArchive createDeployment() {
  return create(WebArchive.class)
  .addAsLibraries(awaitability())
  .addClasses(MyAsyncBeanClassLevel.class)
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
+ .addAsResource("project-defaults.yml");
  }
 
  @Test

fault-tolerance/asynchronous/src/test/java/org/eclipse/microprofile12/faulttolerance/asynchronous/AsyncMethodBeanTest.java

@@ -36,7 +36,8 @@ public static WebArchive createDeployment() {
  return create(WebArchive.class)
  .addAsLibraries(awaitability())
  .addClasses(MyAsyncBeanMethodLevel.class)
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
+ .addAsResource("project-defaults.yml");
  }
 
  @Test // Runs on Server

fault-tolerance/bulkhead/src/main/resources/project-defaults.yml

@@ -0,0 +1,12 @@
+swarm:
+ hystrix:
+ threadpool:
+ default:
+ maximumSize: 10 #SHOULD BE >= AsynchronousBulkheadBean @Bulkead value + @Bulkhead waitingTaskQueue
+ allowMaximumSizeToDivergeFromCoreSize: true
+ command:
+ default:
+ execution:
+ isolation:
+ thread:
+ timeoutInMilliseconds: 21500 #MORE THAN (AsynchronousBulkheadBean @Bulkead value + @Bulkhead waitingTaskQueue -1) * AsynchronousBulkheadBean.AWAIT

fault-tolerance/bulkhead/src/test/java/org/eclipse/microprofile12/faulttolerance/bulkhead/AsynchronousBulkheadBeanTest.java

@@ -33,7 +33,8 @@ public class AsynchronousBulkheadBeanTest {
  public static WebArchive createDeployment() {
  return ShrinkWrap.create(WebArchive.class)
  .addClasses(AsynchronousBulkheadBean.class)
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
+ .addAsResource("project-defaults.yml");
  }
 
  /**
@@ -104,8 +105,12 @@ public void bulkheadLimitTest() throws NoSuchMethodException {
  Logger.getLogger(AsynchronousBulkheadBeanTest.class.getName()).log(Level.SEVERE, null, ie);
  Assert.fail("Got an unexpected InterruptedException");
  } catch (ExecutionException ex) {
- Logger.getLogger(AsynchronousBulkheadBeanTest.class.getName()).log(Level.SEVERE, null, ex);
- Assert.fail("Got an unexpected ExecutionException");
+ if (ex.getCause() instanceof BulkheadException) {
+ failures ++;
+ } else {
+ Logger.getLogger(AsynchronousBulkheadBeanTest.class.getName()).log(Level.SEVERE, null, ex);
+ Assert.fail("Got an unexpected ExecutionException");
+ }
  } catch (BulkheadException be) {
  failures ++;
  }

fault-tolerance/circuitbreaker/src/test/java/org/eclipse/microprofile12/faulttolerance/circuitbreaker/ClassLevelCircuitBreakerBeanTest.java

@@ -116,7 +116,7 @@ private List<Future<String>> executeThrowExceptionMethodAsynchronously(int itera
  boolean shouldThrowException) {
  List<Future<String>> futures = new ArrayList<>();
 
- ExecutorService executorService = Executors.newFixedThreadPool(iterations);
+ ExecutorService executorService = Executors.newSingleThreadExecutor();
 
  Callable<String> task = () -> { 
  classLevelCircuitBreakerBean.throwException(shouldThrowException);

fault-tolerance/circuitbreaker/src/test/java/org/eclipse/microprofile12/faulttolerance/circuitbreaker/MethodLevelCircuitBreakerBeanTest.java

@@ -141,7 +141,7 @@ private List<Future<String>> executeThrowExceptionMethodAsynchronously(int itera
  boolean shouldThrowException) {
  List<Future<String>> futures = new ArrayList<>();
 
- ExecutorService executorService = Executors.newFixedThreadPool(iterations);
+ ExecutorService executorService = Executors.newSingleThreadExecutor();
 
  Callable<String> task = () -> { 
  methodLevelCircuitBreakerBean.throwException(shouldThrowException);

fault-tolerance/timeout/src/main/resources/project-defaults.yml

@@ -0,0 +1,8 @@
+swarm:
+ hystrix:
+ command:
+ default:
+ execution:
+ isolation:
+ thread:
+ timeoutInMilliseconds: 3500 #MORE THAN AsynchronousTimeoutBean.AWAIT CONFIGURED IN TESTS

fault-tolerance/timeout/src/test/java/org/eclipse/microprofile/samples12/timeout/AsynchronousTimeoutBeanTest.java

@@ -3,6 +3,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import javax.inject.Inject;
+
 import org.eclipse.microprofile.faulttolerance.exceptions.TimeoutException;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -27,7 +28,8 @@ public class AsynchronousTimeoutBeanTest {
  public static WebArchive createDeployment() {
  return ShrinkWrap.create(WebArchive.class)
  .addClasses(AsynchronousTimeoutBean.class)
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
+ .addAsResource("project-defaults.yml");
  }
 
  /**
@@ -43,6 +45,10 @@ public void timeoutTest() throws InterruptedException, ExecutionException {
  future.get();
  } catch (TimeoutException toe) {
  return;
+ } catch (ExecutionException ex) {
+ if (ex.getCause() instanceof TimeoutException) {
+ return;
+ }
  }
 
  Assert.fail();