Skip to content

Commit 179b5ad

Browse files
tomas-langerspericas
tomas-langer
and
spericas
authored
MP on Níma (helidon-io#5176)
* Helidon MicroProfile switch from SE to Níma Signed-off-by: Tomas Langer <tomas.langer@oracle.com> Co-authored-by: Santiago Pericas-Geertsen <santiago.pericasgeertsen@oracle.com>
1 parent a4ea634 commit 179b5ad

534 files changed

Lines changed: 18241 additions & 11577 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎applications/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
-->
1919

2020
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
21-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2222
<modelVersion>4.0.0</modelVersion>
2323
<parent>
2424
<groupId>io.helidon</groupId>

‎applications/se/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
-->
1919

2020
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
21-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2222
<modelVersion>4.0.0</modelVersion>
2323
<parent>
2424
<groupId>io.helidon.applications</groupId>

‎archetypes/helidon/src/main/archetype/common/extra.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
</list>
111111
<list key="Main-helidon-imports" if="${flavor} == 'se'">
112112
<value>io.helidon.reactive.webserver.cors.CorsSupport</value>
113-
<value>io.helidon.reactive.webserver.cors.CrossOriginConfig</value>
113+
<value>io.helidon.cors.CrossOriginConfig</value>
114114
</list>
115115
<list key="Main-createRouting" if="${flavor} == 'se'">
116116
<value><![CDATA[

‎archetypes/helidon/src/main/archetype/common/observability.xml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,15 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
6767
<map order="800" if="${flavor} == 'se'">
6868
<value key="groupId">io.helidon.metrics</value>
6969
<value key="artifactId">helidon-metrics</value>
70+
<value key="scope">provided</value>
71+
</map>
72+
<map order="800" if="${flavor} == 'se'">
73+
<value key="groupId">io.helidon.reactive.metrics</value>
74+
<value key="artifactId">helidon-reactive-metrics</value>
7075
</map>
7176
</list>
7277
<list key="Main-helidon-imports">
73-
<value>io.helidon.metrics.MetricsSupport</value>
78+
<value>io.helidon.reactive.metrics.MetricsSupport</value>
7479
</list>
7580
<list key="Main-routingBuilder">
7681
<value><![CDATA[ .register(MetricsSupport.create()) // Metrics at "/metrics"]]></value>
@@ -331,10 +336,15 @@ allRequests_total 0.0
331336
<map order="800" if="${flavor} == 'se' &amp;&amp; !(${metrics.provider} == 'microprofile')">
332337
<value key="groupId">io.helidon.metrics</value>
333338
<value key="artifactId">helidon-metrics</value>
339+
<value key="scope">provided</value>
340+
</map>
341+
<map order="800" if="${flavor} == 'se' &amp;&amp; !(${metrics.provider} == 'microprofile')">
342+
<value key="groupId">io.helidon.reactive.metrics</value>
343+
<value key="artifactId">helidon-reactive-metrics</value>
334344
</map>
335345
</list>
336346
<list key="Main-helidon-imports" if="!(${metrics.provider} == 'microprofile')">
337-
<value>io.helidon.metrics.MetricsSupport</value>
347+
<value>io.helidon.reactive.metrics.MetricsSupport</value>
338348
</list>
339349
<list key="Main-routingBuilder" if="!(${metrics.provider} == 'microprofile')">
340350
<value><![CDATA[ .register(MetricsSupport.create()) // Metrics at "/metrics"]]></value>

‎archetypes/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/TestCORS.java.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import io.helidon.reactive.webclient.WebClientRequestBuilder;
99
import io.helidon.reactive.webclient.WebClientRequestHeaders;
1010
import io.helidon.reactive.webclient.WebClientResponse;
1111
import io.helidon.reactive.webclient.WebClientResponseHeaders;
12-
import io.helidon.reactive.webserver.cors.CrossOriginConfig;
12+
import io.helidon.cors.CrossOriginConfig;
1313
import org.junit.jupiter.api.AfterAll;
1414
import org.junit.jupiter.api.BeforeAll;
1515
import org.junit.jupiter.api.Test;

‎archetypes/helidon/src/main/archetype/se/custom/files/src/test/java/__pkg__/TestCORS.java.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import io.helidon.reactive.webclient.WebClientRequestHeaders;
99
import io.helidon.reactive.webclient.WebClientResponse;
1010
import io.helidon.reactive.webclient.WebClientResponseHeaders;
1111
import io.helidon.reactive.webserver.WebServer;
12-
import io.helidon.reactive.webserver.cors.CrossOriginConfig;
12+
import io.helidon.cors.CrossOriginConfig;
1313
import org.junit.jupiter.api.AfterAll;
1414
import org.junit.jupiter.api.Assertions;
1515
import org.junit.jupiter.api.BeforeAll;

‎bom/pom.xml‎

Lines changed: 55 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,16 @@
198198
<artifactId>helidon-graphql-server</artifactId>
199199
<version>${helidon.version}</version>
200200
</dependency>
201+
<dependency>
202+
<groupId>io.helidon.nima.graphql</groupId>
203+
<artifactId>helidon-nima-graphql-server</artifactId>
204+
<version>${helidon.version}</version>
205+
</dependency>
206+
<dependency>
207+
<groupId>io.helidon.reactive.graphql</groupId>
208+
<artifactId>helidon-reactive-graphql-server</artifactId>
209+
<version>${helidon.version}</version>
210+
</dependency>
201211
<dependency>
202212
<groupId>io.helidon.microprofile.graphql</groupId>
203213
<artifactId>helidon-microprofile-graphql-server</artifactId>
@@ -245,6 +255,11 @@
245255
<artifactId>helidon-reactive-media-multipart</artifactId>
246256
<version>${helidon.version}</version>
247257
</dependency>
258+
<dependency>
259+
<groupId>io.helidon.reactive.metrics</groupId>
260+
<artifactId>helidon-reactive-metrics</artifactId>
261+
<version>${helidon.version}</version>
262+
</dependency>
248263
<!-- config -->
249264
<dependency>
250265
<groupId>io.helidon.config</groupId>
@@ -392,6 +407,11 @@
392407
<artifactId>helidon-security-integration-webserver</artifactId>
393408
<version>${helidon.version}</version>
394409
</dependency>
410+
<dependency>
411+
<groupId>io.helidon.security.integration</groupId>
412+
<artifactId>helidon-security-integration-nima</artifactId>
413+
<version>${helidon.version}</version>
414+
</dependency>
395415
<dependency>
396416
<groupId>io.helidon.security</groupId>
397417
<artifactId>helidon-security-annotations</artifactId>
@@ -529,6 +549,11 @@
529549
<artifactId>helidon-microprofile-websocket</artifactId>
530550
<version>${helidon.version}</version>
531551
</dependency>
552+
<dependency>
553+
<groupId>io.helidon.microprofile.service-common</groupId>
554+
<artifactId>helidon-microprofile-service-common</artifactId>
555+
<version>${helidon.version}</version>
556+
</dependency>
532557
<!-- metrics -->
533558
<dependency>
534559
<groupId>io.helidon.metrics</groupId>
@@ -621,16 +646,6 @@
621646
<artifactId>helidon-common-context</artifactId>
622647
<version>${helidon.version}</version>
623648
</dependency>
624-
<dependency>
625-
<groupId>io.helidon.service-common</groupId>
626-
<artifactId>helidon-service-common-rest</artifactId>
627-
<version>${helidon.version}</version>
628-
</dependency>
629-
<dependency>
630-
<groupId>io.helidon.service-common</groupId>
631-
<artifactId>helidon-service-common-rest-cdi</artifactId>
632-
<version>${helidon.version}</version>
633-
</dependency>
634649
<dependency>
635650
<groupId>io.helidon.common</groupId>
636651
<artifactId>helidon-common-crypto</artifactId>
@@ -666,6 +681,11 @@
666681
<artifactId>helidon-common-testing-http-junit5</artifactId>
667682
<version>${helidon.version}</version>
668683
</dependency>
684+
<dependency>
685+
<groupId>io.helidon.reactive.service-common</groupId>
686+
<artifactId>helidon-reactive-service-common</artifactId>
687+
<version>${helidon.version}</version>
688+
</dependency>
669689

670690
<!-- db client -->
671691
<dependency>
@@ -1070,12 +1090,22 @@
10701090
<artifactId>helidon-openapi</artifactId>
10711091
<version>${helidon.version}</version>
10721092
</dependency>
1093+
<dependency>
1094+
<groupId>io.helidon.reactive.openapi</groupId>
1095+
<artifactId>helidon-reactive-openapi</artifactId>
1096+
<version>${helidon.version}</version>
1097+
</dependency>
10731098
<dependency>
10741099
<groupId>io.helidon.microprofile.openapi</groupId>
10751100
<artifactId>helidon-microprofile-openapi</artifactId>
10761101
<version>${helidon.version}</version>
10771102
</dependency>
10781103
<!-- CORS support -->
1104+
<dependency>
1105+
<groupId>io.helidon.cors</groupId>
1106+
<artifactId>helidon-cors</artifactId>
1107+
<version>${helidon.version}</version>
1108+
</dependency>
10791109
<dependency>
10801110
<groupId>io.helidon.reactive.webserver.cors</groupId>
10811111
<artifactId>helidon-cors</artifactId>
@@ -1265,6 +1295,11 @@
12651295
<artifactId>helidon-nima-webserver-access-log</artifactId>
12661296
<version>${helidon.version}</version>
12671297
</dependency>
1298+
<dependency>
1299+
<groupId>io.helidon.nima.webserver</groupId>
1300+
<artifactId>helidon-nima-webserver-context</artifactId>
1301+
<version>${helidon.version}</version>
1302+
</dependency>
12681303
<dependency>
12691304
<groupId>io.helidon.nima.webserver</groupId>
12701305
<artifactId>helidon-nima-webserver-static-content</artifactId>
@@ -1325,6 +1360,11 @@
13251360
<artifactId>helidon-nima-observe-health</artifactId>
13261361
<version>${helidon.version}</version>
13271362
</dependency>
1363+
<dependency>
1364+
<groupId>io.helidon.nima.observe</groupId>
1365+
<artifactId>helidon-nima-observe-metrics</artifactId>
1366+
<version>${helidon.version}</version>
1367+
</dependency>
13281368
<dependency>
13291369
<groupId>io.helidon.nima.observe</groupId>
13301370
<artifactId>helidon-nima-observe-info</artifactId>
@@ -1345,6 +1385,11 @@
13451385
<artifactId>helidon-nima-fault-tolerance</artifactId>
13461386
<version>${helidon.version}</version>
13471387
</dependency>
1388+
<dependency>
1389+
<groupId>io.helidon.nima.openapi</groupId>
1390+
<artifactId>helidon-nima-openapi</artifactId>
1391+
<version>${helidon.version}</version>
1392+
</dependency>
13481393

13491394
<!-- Pico -->
13501395
<dependency>

‎common/http/src/main/java/io/helidon/common/http/Http.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,6 +1603,17 @@ public static final class HeaderValues {
16031603
* Content length with 0 value.
16041604
*/
16051605
public static final HeaderValue CONTENT_LENGTH_ZERO = Header.createCached(Header.CONTENT_LENGTH, "0");
1606+
/**
1607+
* Cache control without any caching.
1608+
*/
1609+
public static final HeaderValue CACHE_NO_CACHE = Header.create(Header.CACHE_CONTROL, "no-cache",
1610+
"no-store",
1611+
"must-revalidate",
1612+
"no-transform");
1613+
/**
1614+
* Cache control that allows caching with no transform.
1615+
*/
1616+
public static final HeaderValue CACHE_NORMAL = Header.createCached(Header.CACHE_CONTROL, "no-transform");
16061617

16071618
private HeaderValues() {
16081619
}

‎common/http/src/main/java/io/helidon/common/http/MethodPredicates.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ public boolean test(Http.Method t) {
3838
public Set<Method> acceptedMethods() {
3939
return Set.of();
4040
}
41+
42+
@Override
43+
public String toString() {
44+
return "(any method)";
45+
}
4146
}
4247

4348
static class SingleMethodEnumPredicate implements MethodPredicate {

nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/http/PathMatcher.java renamed to common/http/src/main/java/io/helidon/common/http/PathMatcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.helidon.nima.webserver.http;
17+
package io.helidon.common.http;
1818

1919
import io.helidon.common.uri.UriPath;
2020

0 commit comments

Comments
 (0)