Added CDI @asynchronous sample and fixed Swarm Arquillian deps

Author: arjantijms

config/README.md

@@ -1,38 +1,14 @@
-# Eclipse MicroProfile 1.2 Samples - JWT Auth 1.0
+# Eclipse MicroProfile 1.2 Samples - Config 1.1
 
- - [Wiki project page](https://wiki.eclipse.org/MicroProfile/JWT_Auth)
- - [Spec, API, TCK GitHub repo](https://github.com/eclipse/microprofile-jwt-auth)
+ - [Wiki project page](https://wiki.eclipse.org/MicroProfile/Config)
+ - [Spec, API, TCK GitHub repo](https://github.com/eclipse/microprofile-config)
 
 ## Samples ##
 
- - **basic-authentication** The test sends a very basic signed JWT token to a protected servlet. The MP-JWT Auth implementation
- checks if the token is valid and sets the authenticated identity from the `upn` field and `groups` field
+ - **basic-injection** Shows the injection of some simple values from the `META-INF/microprofile-config.properties` file
+ - **config-source** Shows how an alternative programmatic source for configuration values can be used
+ - **converter** Shows how a custom converter is globally set so values from a config source can be converted to the type of the injection point.
+ - **default-conversion** Shows that a number of default conversions can be applied to injected values
 
 
 
-## Implementation config ##
-
-There's at least 2 items that need to be configured in an implementation specific way: the *issuer*, which represents the party that vended the token, and the *public key* which is used to verify the signature of a JWT token being sent to the server.
-
- - **Payara (tech preview)** 
- - *issuer* - defined in "payara-mp-jwt.properties" which is placed in the classpath root of the application archive 
- - *public key* - the file "publicKey.pem" which is also placed in the classpath root of the application archive
- - **Liberty**
- - *issuer* - defined in the "mpJwt" tag in "server.xml" which in the placed inside the installed Liberty: `[install dir]/wlp/usr/servers/defaultServer/server.xml`
- - *public key* - the file "key.jks" which in the placed inside the installed Liberty: `[install dir]/wlp/usr/servers/defaultServer/resources/security/key.jks`
-- **WildFly (Swarm)**
- - *issuer* - defined in "project-default.yml" which is placed in the classpath root of the application archive. This also configures the security system (security domain in JBoss terms) such that all artifacts to support MP-Auth JWT are installed
- - *public key* - the file "MP-JWT-SIGNER" which is placed in the classpath's META-INF of the application archive.
- 
- 
-## TCK ##
-
-The public/private keys are taken from the MP-Auth TCK. The Liberty key is in a special format and has been taken from the Liberty TCK version. Config files for the various servers are inspired by those in the TCK and TCK extensions.
-
-See the following URLs:
-
- - [MP-Auth TCK](https://github.com/eclipse/microprofile-jwt-auth/tree/master/tck)
- - [Payara TCK Ext](https://github.com/payara/Payara/tree/Payara-5/appserver/payara-appserver-modules/microprofile/jwt-auth-tck)
- - [Liberty TCK](https://github.com/OpenLiberty/open-liberty/tree/master/dev/com.ibm.ws.security.mp.jwt_fat_tck)
- - [WildFly TCK Ext](https://github.com/MicroProfileJWT/wfswarm-jwt-auth-tck)
-

config/basic-injection/src/test/java/org/eclipse/microprofile12/config/basicinjection/BasicInjectionTest.java

@@ -29,7 +29,7 @@ public class BasicInjectionTest {
  @Deployment(testable = false)
  public static WebArchive createDeployment() {
  WebArchive archive = 
- create(WebArchive.class)
+ create(WebArchive.class, "BasicInjectionTest.war")
  .addClasses(
  ApplicationInit.class,
  Servlet.class

config/config-source/src/test/java/org/eclipse/microprofile12/config/configsource/ConfigSourceNotPresentTest.java

@@ -30,7 +30,7 @@ public class ConfigSourceNotPresentTest {
  @Deployment(testable = false)
  public static WebArchive createDeployment() {
  WebArchive archive = 
- create(WebArchive.class)
+ create(WebArchive.class, "ConfigSourceNotPresentTest.war")
  .addClasses(
  ApplicationInit.class,
  Servlet.class

config/config-source/src/test/java/org/eclipse/microprofile12/config/configsource/ConfigSourcePresentTest.java

@@ -29,7 +29,7 @@ public class ConfigSourcePresentTest {
  @Deployment(testable = false)
  public static WebArchive createDeployment() {
  WebArchive archive = 
- create(WebArchive.class)
+ create(WebArchive.class, "ConfigSourcePresentTest.war")
  .addClasses(
  ApplicationInit.class,
  EchoConfigSource.class,

fault-tolerance/README.md

@@ -0,0 +1,12 @@
+# Eclipse MicroProfile 1.2 Samples - Fault Tolerance
+
+ - [Wiki project page](https://wiki.eclipse.org/MicroProfile/Fault_Tolerance)
+ - [Spec, API, TCK GitHub repo](https://github.com/eclipse/microprofile-fault-tolerance)
+
+## Samples ##
+
+ - **asynchronous** Demonstrates a CDI version of the EJB @Asynchronous annotation
+ 
+ 
+
+

fault-tolerance/asynchronous/pom.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.microprofile.samples12</groupId>
+ <artifactId>fault-tolerance</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>asynchronous</artifactId>
+ <packaging>war</packaging>
+ <name>MicroProfile 1.2: Fault Tolerance - Asynchronous</name>
+ 
+</project>

fault-tolerance/asynchronous/src/main/java/org/eclipse/microprofile12/faulttolerance/asynchronous/MyAsyncBeanClassLevel.java

@@ -0,0 +1,35 @@
+package org.eclipse.microprofile12.faulttolerance.asynchronous;
+
+import static java.lang.Thread.sleep;
+import static java.util.concurrent.CompletableFuture.completedFuture;
+
+import java.util.concurrent.Future;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.faulttolerance.Asynchronous;
+
+/**
+ * @author Arun Gupta
+ * @author Arjan Tijms
+ */
+@Asynchronous
+@ApplicationScoped
+public class MyAsyncBeanClassLevel {
+
+ public static final long AWAIT = 3000;
+
+ public Future<Integer> addNumbers(int n1, int n2) {
+ try {
+ // simulating a long running query
+ sleep(AWAIT);
+ } catch (InterruptedException ex) {
+ Logger.getLogger(MyAsyncBeanClassLevel.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ 
+ return completedFuture(n1 + n2);
+ }
+
+}

fault-tolerance/asynchronous/src/main/java/org/eclipse/microprofile12/faulttolerance/asynchronous/MyAsyncBeanMethodLevel.java

@@ -0,0 +1,35 @@
+package org.eclipse.microprofile12.faulttolerance.asynchronous;
+
+import static java.lang.Thread.sleep;
+import static java.util.concurrent.CompletableFuture.completedFuture;
+import static java.util.logging.Level.SEVERE;
+
+import java.util.concurrent.Future;
+import java.util.logging.Logger;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.faulttolerance.Asynchronous;
+
+/**
+ * @author Arun Gupta
+ * @author Arjan Tijms
+ */
+@ApplicationScoped
+public class MyAsyncBeanMethodLevel {
+
+ public static final long AWAIT = 3000;
+
+ @Asynchronous
+ public Future<Integer> addNumbers(int n1, int n2) {
+ try {
+ // Simulating a long running query
+ sleep(AWAIT);
+ } catch (InterruptedException ex) {
+ Logger.getLogger(MyAsyncBeanMethodLevel.class.getName()).log(SEVERE, null, ex);
+ }
+ 
+ return completedFuture(n1 + n2);
+ }
+
+}

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

@@ -0,0 +1,58 @@
+package org.eclipse.microprofile12.faulttolerance.asynchronous;
+
+import static com.jayway.awaitility.Awaitility.await;
+import static java.lang.System.currentTimeMillis;
+import static org.eclipse.microprofile12.Libraries.awaitability;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.lessThan;
+import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import javax.inject.Inject;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author Jakub Marchwicki
+ * @author Arjan Tijms
+ */
+@RunWith(Arquillian.class)
+public class AsyncClassBeanTest {
+
+ @Inject
+ private MyAsyncBeanClassLevel bean;
+
+ @Deployment
+ public static WebArchive createDeployment() {
+ return create(WebArchive.class)
+ .addAsLibraries(awaitability())
+ .addClasses(MyAsyncBeanClassLevel.class)
+ .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+ @Test
+ public void shouldReturnAsyncSum() throws ExecutionException, InterruptedException {
+ Integer numberOne = 5;
+ Integer numberTwo = 10;
+
+ long start = currentTimeMillis();
+ Future<Integer> resultFuture = bean.addNumbers(numberOne, numberTwo);
+
+ assertThat(resultFuture.isDone(), is(equalTo(false)));
+ assertThat(currentTimeMillis() - start, is(lessThan(MyAsyncBeanMethodLevel.AWAIT)));
+
+ await().until(() -> resultFuture.isDone());
+
+ assertThat(resultFuture.get(), is(equalTo(numberOne + numberTwo)));
+ }
+
+}

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

@@ -0,0 +1,58 @@
+package org.eclipse.microprofile12.faulttolerance.asynchronous;
+
+import static com.jayway.awaitility.Awaitility.await;
+import static java.lang.System.currentTimeMillis;
+import static org.eclipse.microprofile12.Libraries.awaitability;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.lessThan;
+import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import javax.inject.Inject;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author Jakub Marchwicki
+ * @author Arjan Tijms
+ */
+@RunWith(Arquillian.class)
+public class AsyncMethodBeanTest {
+
+ @Inject
+ private MyAsyncBeanMethodLevel bean;
+
+ @Deployment
+ public static WebArchive createDeployment() {
+ return create(WebArchive.class)
+ .addAsLibraries(awaitability())
+ .addClasses(MyAsyncBeanMethodLevel.class)
+ .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+ @Test // Runs on Server
+ public void shouldReturnAsyncSum() throws ExecutionException, InterruptedException {
+ Integer numberOne = 5;
+ Integer numberTwo = 10;
+
+ long start = currentTimeMillis();
+ Future<Integer> resultFuture = bean.addNumbers(numberOne, numberTwo);
+
+ assertThat(resultFuture.isDone(), is(equalTo(false)));
+ assertThat(currentTimeMillis() - start, is(lessThan(MyAsyncBeanMethodLevel.AWAIT)));
+
+ await().until(() -> resultFuture.isDone());
+
+ assertThat(resultFuture.get(), is(equalTo(numberOne + numberTwo)));
+ }
+
+}