Merge PR #68

Author: jroper

.editorconfig

@@ -0,0 +1,19 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.adoc]
+trim_trailing_whitespace = false

streams/.gitattributes renamed to .gitattributes

@@ -0,0 +1,16 @@
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+==  Version 2.0, in this case for Microprofile Reactive Streams        ==
+=========================================================================
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+SPDXVersion: SPDX-2.1
+PackageName: Eclipse Microprofile
+PackageHomePage: http://www.eclipse.org/microprofile
+PackageLicenseDeclared: Apache-2.0
+
+PackageCopyrightText: <text>
+James Roper [email protected]
+</text>

NOTICE

@@ -17,7 +17,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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>
 
@@ -41,7 +41,7 @@
             <artifactId>org.osgi.annotation.versioning</artifactId>
         </dependency>
         <dependency>
-           <groupId>org.eclipse.microprofile.reactive.streams</groupId>
+            <groupId>org.eclipse.microprofile.reactive.streams</groupId>
             <artifactId>microprofile-reactive-streams-operators</artifactId>
         </dependency>
     </dependencies>

messaging/api/pom.xml

@@ -30,13 +30,13 @@
  * Methods annotated with this annotation must have one of the following shapes:
  * <p>
  * <ul>
- *   <li>Take zero parameters, and return a {@link org.eclipse.microprofile.reactive.streams.SubscriberBuilder}.</li>
- *   <li>Take zero parameters, and return a {@link org.reactivestreams.Subscriber}.</li>
- *   <li>Take zero parameters, and return a {@link org.eclipse.microprofile.reactive.streams.ProcessorBuilder}.</li>
- *   <li>Take zero parameters, and return a {@link org.reactivestreams.Processor}.</li>
- *   <li>Accept a single parameter, and return a {@link java.util.concurrent.CompletionStage}.</li>
- *   <li>Accept a single parameter, and return void.</li>
- *   <li>Accept a single parameter, and return any type.</li>
+ * <li>Take zero parameters, and return a {@link org.eclipse.microprofile.reactive.streams.SubscriberBuilder}.</li>
+ * <li>Take zero parameters, and return a {@link org.reactivestreams.Subscriber}.</li>
+ * <li>Take zero parameters, and return a {@link org.eclipse.microprofile.reactive.streams.ProcessorBuilder}.</li>
+ * <li>Take zero parameters, and return a {@link org.reactivestreams.Processor}.</li>
+ * <li>Accept a single parameter, and return a {@link java.util.concurrent.CompletionStage}.</li>
+ * <li>Accept a single parameter, and return void.</li>
+ * <li>Accept a single parameter, and return any type.</li>
  * </ul>
  * <p>
  * In addition, implementations of this specification may allow returning additional types, such as implementation
@@ -80,28 +80,28 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Incoming {
 
-  /**
-   * The topic to subscribe to.
-   * <p>
-   * If not set, it is assumed some other messaging provider specific mechanism will be used to identify which
-   * messages this subscriber will receive.
-   */
-  String topic() default "";
+    /**
+     * The topic to subscribe to.
+     * <p>
+     * If not set, it is assumed some other messaging provider specific mechanism will be used to identify which
+     * messages this subscriber will receive.
+     */
+    String topic() default "";
 
-  /**
-   * The messaging provider.
-   * <p>
-   * If not set, then the container may provide a container specific mechanism for selecting a default messaging
-   * provider.
-   * <p>
-   * Note that not all messaging providers are compatible with all containers, it is up to each container to
-   * decide which messaging providers it will accept, to define the messaging provider classes to pass here, and
-   * to potentially offer a container specific extension point for plugging in new containers.
-   * <p>
-   * If the container does not support the selected messaging provider, it must raise a deployment exception before
-   * the container is initialized.
-   * <p>
-   * The use of this property is inherently non portable.
-   */
-  Class<? extends MessagingProvider> provider() default MessagingProvider.class;
+    /**
+     * The messaging provider.
+     * <p>
+     * If not set, then the container may provide a container specific mechanism for selecting a default messaging
+     * provider.
+     * <p>
+     * Note that not all messaging providers are compatible with all containers, it is up to each container to
+     * decide which messaging providers it will accept, to define the messaging provider classes to pass here, and
+     * to potentially offer a container specific extension point for plugging in new containers.
+     * <p>
+     * If the container does not support the selected messaging provider, it must raise a deployment exception before
+     * the container is initialized.
+     * <p>
+     * The use of this property is inherently non portable.
+     */
+    Class<? extends MessagingProvider> provider() default MessagingProvider.class;
 }

messaging/api/src/main/java/org/eclipse/microprofile/reactive/messaging/Incoming.java

@@ -33,46 +33,46 @@
  */
 public interface Message<T> {
 
-  /**
-   * The payload for this message.
-   */
-  T getPayload();
+    /**
+     * Create a message with the given payload.
+     *
+     * @param payload The payload.
+     * @return A message with the given payload, and a no-op ack function.
+     */
+    static <T> Message<T> of(T payload) {
+        return () -> payload;
+    }
 
-  /**
-   * Acknowledge this message.
-   */
-  default CompletionStage<Void> ack() {
-    return CompletableFuture.completedFuture(null);
-  }
+    /**
+     * Create a message with the given payload and ack function.
+     *
+     * @param payload The payload.
+     * @param ack     The ack function, this will be invoked when the returned messages {@link #ack()} method is invoked.
+     * @return A message with the given payload and ack function.
+     */
+    static <T> Message<T> of(T payload, Supplier<CompletionStage<Void>> ack) {
+        return new Message<T>() {
+            @Override
+            public T getPayload() {
+                return payload;
+            }
 
-  /**
-   * Create a message with the given payload.
-   *
-   * @param payload The payload.
-   * @return A message with the given payload, and a no-op ack function.
-   */
-  static <T> Message<T> of(T payload) {
-    return () -> payload;
-  }
+            @Override
+            public CompletionStage<Void> ack() {
+                return ack.get();
+            }
+        };
+    }
 
-  /**
-   * Create a message with the given payload and ack function.
-   *
-   * @param payload The payload.
-   * @param ack The ack function, this will be invoked when the returned messages {@link #ack()} method is invoked.
-   * @return A message with the given payload and ack function.
-   */
-  static <T> Message<T> of(T payload, Supplier<CompletionStage<Void>> ack) {
-    return new Message<T>() {
-      @Override
-      public T getPayload() {
-        return payload;
-      }
+    /**
+     * The payload for this message.
+     */
+    T getPayload();
 
-      @Override
-      public CompletionStage<Void> ack() {
-        return ack.get();
-      }
-    };
-  }
+    /**
+     * Acknowledge this message.
+     */
+    default CompletionStage<Void> ack() {
+        return CompletableFuture.completedFuture(null);
+    }
 }

messaging/api/src/main/java/org/eclipse/microprofile/reactive/messaging/Message.java

@@ -30,12 +30,12 @@
  * Methods annotated with this annotation must have one of the following shapes:
  * <p>
  * <ul>
- *   <li>Take zero parameters, and return a {@link org.eclipse.microprofile.reactive.streams.PublisherBuilder}.</li>
- *   <li>Take zero parameters, and return a {@link org.reactivestreams.Publisher}.</li>
- *   <li>Take zero parameters, and return a {@link org.eclipse.microprofile.reactive.streams.ProcessorBuilder}.</li>
- *   <li>Take zero parameters, and return a {@link org.reactivestreams.Processor}.</li>
- *   <li>Accept a single parameter, and return a {@link java.util.concurrent.CompletionStage}.</li>
- *   <li>Accept a single parameter, and return any type.</li>
+ * <li>Take zero parameters, and return a {@link org.eclipse.microprofile.reactive.streams.PublisherBuilder}.</li>
+ * <li>Take zero parameters, and return a {@link org.reactivestreams.Publisher}.</li>
+ * <li>Take zero parameters, and return a {@link org.eclipse.microprofile.reactive.streams.ProcessorBuilder}.</li>
+ * <li>Take zero parameters, and return a {@link org.reactivestreams.Processor}.</li>
+ * <li>Accept a single parameter, and return a {@link java.util.concurrent.CompletionStage}.</li>
+ * <li>Accept a single parameter, and return any type.</li>
  * </ul>
  * <p>
  * In addition, implementations of this specification may allow returning additional types, such as implementation
@@ -64,28 +64,28 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Outgoing {
 
-  /**
-   * The topic to publish to.
-   * <p>
-   * If not set, it is assumed some other messaging provider specific mechanism will be used to identify the
-   * destination that this publisher will send to.
-   */
-  String topic() default "";
+    /**
+     * The topic to publish to.
+     * <p>
+     * If not set, it is assumed some other messaging provider specific mechanism will be used to identify the
+     * destination that this publisher will send to.
+     */
+    String topic() default "";
 
-  /**
-   * The messaging provider.
-   * <p>
-   * If not set, then the container may provide a container specific mechanism for selecting a default messaging
-   * provider.
-   * <p>
-   * Note that not all messaging providers are compatible with all containers, it is up to each container to
-   * decide which messaging providers it will accept, to define the messaging provider classes to pass here, and
-   * to potentially offer a container specific extension point for plugging in new containers.
-   * <p>
-   * If the container does not support the selected messaging provider, it must raise a deployment exception before
-   * the container is initialized.
-   * <p>
-   * The use of this property is inherently non portable.
-   */
-  Class<? extends MessagingProvider> provider() default MessagingProvider.class;
+    /**
+     * The messaging provider.
+     * <p>
+     * If not set, then the container may provide a container specific mechanism for selecting a default messaging
+     * provider.
+     * <p>
+     * Note that not all messaging providers are compatible with all containers, it is up to each container to
+     * decide which messaging providers it will accept, to define the messaging provider classes to pass here, and
+     * to potentially offer a container specific extension point for plugging in new containers.
+     * <p>
+     * If the container does not support the selected messaging provider, it must raise a deployment exception before
+     * the container is initialized.
+     * <p>
+     * The use of this property is inherently non portable.
+     */
+    Class<? extends MessagingProvider> provider() default MessagingProvider.class;
 }

messaging/api/src/main/java/org/eclipse/microprofile/reactive/messaging/Outgoing.java

@@ -53,4 +53,4 @@
  *   }
  * </pre>
  */
-package org.eclipse.microprofile.reactive.messaging;
+package org.eclipse.microprofile.reactive.messaging;