Combine with concurrent changes

helidon-io · May 6, 2019 · 2161817 · 2161817
2 parents 39cd982 + baefb32
commit 2161817
Show file tree

Hide file tree

Showing 270 changed files with 29,131 additions and 378 deletions.
diff --git a/.gitignore b/.gitignore
@@ -67,3 +67,5 @@ node/
 # Other
 *~
 user.txt
+ObjectStore/
+PutObjectStoreDirHere/
diff --git a/3RD-PARTY.txt b/3RD-PARTY.txt
@@ -2220,3 +2220,23 @@ from the source code management (SCM) system project uses.
 -----------------jackson-annotations 2.9.8 -----------------------
 COPYRIGHT: Copyright (c) 2007- Tatu Saloranta, [email protected]
 LICENSE: Apache 2.0
+
+=======================
+SnakeYAML 1.24
+=======================
+Copyright (c) 2008, http://www.snakeyaml.org
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+LICENSE: Apache 2.0
+
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -52,6 +52,17 @@
                 <artifactId>helidon-webserver-test-support</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <!-- gRPC server -->
+            <dependency>
+                <groupId>io.helidon.grpc</groupId>
+                <artifactId>helidon-grpc-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.helidon.grpc</groupId>
+                <artifactId>helidon-grpc-server</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <!-- media -->
             <dependency>
                 <groupId>io.helidon.media</groupId>
@@ -170,6 +181,11 @@
                 <artifactId>helidon-security-providers-http-sign</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.security.integration</groupId>
+                <artifactId>helidon-security-integration-grpc</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.helidon.security.integration</groupId>
                 <artifactId>helidon-security-integration-jersey</artifactId>
@@ -186,10 +202,10 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-            <groupId>io.helidon.security.providers</groupId>
-            <artifactId>helidon-security-providers-abac</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+                <groupId>io.helidon.security.providers</groupId>
+                <artifactId>helidon-security-providers-abac</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.helidon.security</groupId>
                 <artifactId>helidon-security-abac-time</artifactId>
@@ -318,6 +334,11 @@
                 <artifactId>helidon-common-key-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.common</groupId>
+                <artifactId>helidon-common-service-loader</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- tracing -->
             <dependency>
@@ -398,11 +419,36 @@
                 <artifactId>helidon-integrations-cdi-datasource-hikaricp</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.integrations.cdi</groupId>
+                <artifactId>helidon-integrations-cdi-eclipselink</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.helidon.integrations.cdi</groupId>
                 <artifactId>helidon-integrations-cdi-jedis</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.integrations.cdi</groupId>
+                <artifactId>helidon-integrations-cdi-jpa</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.helidon.integrations.cdi</groupId>
+                <artifactId>helidon-integrations-cdi-jpa-weld</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.helidon.integrations.cdi</groupId>
+                <artifactId>helidon-integrations-cdi-jta</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.helidon.integrations.cdi</groupId>
+                <artifactId>helidon-integrations-cdi-jta-weld</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.helidon.integrations.cdi</groupId>
                 <artifactId>helidon-integrations-cdi-oci-objectstorage</artifactId>

diff --git a/common/common/src/main/java/io/helidon/common/Prioritized.java b/common/common/src/main/java/io/helidon/common/Prioritized.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.helidon.common;
+
+/**
+ * Interface to define that this class is a class with priority.
+ * One of the uses is for services loaded by a ServiceLoader.
+ * <p>
+ * A {@code Prioritized} with lower priority number is more significant than a {@code Prioritized} with a
+ * higher priority number.
+ * <p>
+ * For cases where priority is the same, implementation must define ordering of such {@code Prioritized}.
+ * <p>
+ * <b>Negative priorities are not allowed and services using priorities should throw an
+ * {@link java.lang.IllegalArgumentException} if such a priority is used (unless such a service
+ * documents the specific usage of a negative priority)</b>
+ * <p>
+ * A {@code Prioritized} with priority {@code 1} is more significant (will be returned before) priority {@code 2}.
+ */
+@FunctionalInterface
+public interface Prioritized {
+    /**
+     * Default priority for any prioritized component (whether it implements this interface
+     * or uses {@code javax.annotation.Priority} annotation.
+     */
+    int DEFAULT_PRIORITY = 5000;
+
+    /**
+     * Priority of this class (maybe because it is defined
+     * dynamically, so it cannot be defined by an annotation).
+     * If not dynamic, you can use the {@code javax.annotation.Priority}
+     * annotation rather then implementing this interface as long as
+     * it is supported by the library using this {@code Prioritized}.
+     *
+     * @return the priority of this service, must be a non-negative number
+     */
+    int priority();
+}
diff --git a/common/common/src/main/templates/io/helidon/common/Version.java b/common/common/src/main/templates/io/helidon/common/Version.java
@@ -26,12 +26,17 @@ public class Version {
      */
     public static final String VERSION = "${project.version}";
 
+    /**
+     * Revision Number.
+     */
+    public static final String REVISION = "${buildNumber}";
+
     /**
      * Display version
      *
-     * @param args
+     * @param args Ignored
      */
     public static void main(String[] args) {
-        System.out.println(VERSION);
+        System.out.println(VERSION + " " + REVISION);
     }
 }
diff --git a/common/configurable/src/main/java/io/helidon/common/configurable/ResourceUtil.java b/common/configurable/src/main/java/io/helidon/common/configurable/ResourceUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,7 +90,7 @@ static InputStream toIs(URI uri) {
         try {
             return uri.toURL().openStream();
         } catch (IOException e) {
-            throw new ResourceException("Failed to open strem to uri: " + uri, e);
+            throw new ResourceException("Failed to open stream to uri: " + uri, e);
         }
     }
 
@@ -105,7 +105,7 @@ static InputStream toIs(URI uri, Proxy proxy) {
         try {
             return uri.toURL().openConnection(proxy).getInputStream();
         } catch (IOException e) {
-            throw new ResourceException("Failed to open strem to uri: " + uri, e);
+            throw new ResourceException("Failed to open stream to uri: " + uri, e);
         }
     }
 

diff --git a/common/pom.xml b/common/pom.xml
@@ -36,5 +36,6 @@
         <module>configurable</module>
         <module>key-util</module>
         <module>http</module>
+        <module>service-loader</module>
     </modules>
 </project>
diff --git a/common/service-loader/pom.xml b/common/service-loader/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>helidon-common-project</artifactId>
+        <groupId>io.helidon.common</groupId>
+        <version>1.0.4-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>helidon-common-service-loader</artifactId>
+    <name>Helidon Common Service Loader</name>
+
+    <description>
+        Service loader utilities to extend functionality of
+        Java Service loader.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.helidon.common</groupId>
+            <artifactId>helidon-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>