Skip to content

Commit 43aaf9e

Browse files
romain-grecourtromain-grecourt
authored
Uplevel Nima (helidon-io#7361)
Fixes helidon-io#7164 Fixes helidon-io#7339 - Refactoring: /nima/http -> /http /nima/http2 -> /http/http2 /common/http -> /http/http /nima/webclient -> /webclient /nima/webserver -> /webserver /nima/websocket/websocket -> /websocket /nima/websocket/webserver -> /webserver/websocket /nima/websocket/webclient -> /webclient/websocket /nima/sse -> /http/sse /nima/observe -> /webserver/observe /nima/test -> /webserver/testing /nima/fault-tolerance -> /fault-tolerance /nima/service-common -> /webserver/service-common /nima/graphql/server -> /webserver/graphql /nima/common/tls -> /common/tls /security/integration/nima -> /webserver/security /nima/tests/webserver -> /webserver/tests /nima/tests/websocket/server -> /webserver/tests/websocket /nima/tests/http2/server -> /webserver/tests/http2 /nima/tests/observe -> /webserver/tests/observe /nima/tests/grpc -> /webserver/tests/grpc /nima/tests/sse/server -> /webserver/tests/sse /tests/integration/webserver/* -> /webserver/tests/ /nima/tests/webclient -> /webclient/tests /nima/tests/http2/client -> /webclient/tests/http2 /tests/integration/webclient -> /webclient/tests/ /nima/tests/encoding -> /http/tests/encoding /nima/tests/logging/log4j -> /logging/tests/log4j /nima/tests/media -> /http/tests/media - Remove leftover occurrences of Nima, Níma, nima, NIMA - Fix ModuleInfoDescriptorBlueprint.mergeCreate - Fix WebServer feature definition - Fix Neo4J feature definition - Update keystores in webserver/tests/mtls (to get rid of 'nima' references)
1 parent 66ca33e commit 43aaf9e

2,428 files changed

Lines changed: 30956 additions & 33743 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.

‎DEV-GUIDELINES.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Some of these rules are enforced by checkstyle, some are checked during code rev
7272
configured (e.g. a component may expect tracing endpoint - if not defined, tracing may be disabled)
7373
5. We have introduced `helidon-builder` module, that provides capability to generate builders that support both programmatic and configuration approach. See [helidon-builder](builder/README.md) for more details about modules, and [helidon-builder-api](builder/api/README.md) for explanation of APIs and naming rules. The `Blueprint` approach should be used for all builders (and the API of the prototype). Exceptions must be consulted with project architect (this may result in either changing the processor to support the required feature, or in removing such feature and redesigning the problem, or in an exception (documented) to the rule)
7474

75-
Example: [io.helidon.nima.faulttolerance.RetryConfigBlueprint](nima/fault-tolerance/fault-tolerance/src/main/java/io/helidon/nima/faulttolerance/RetryConfigBlueprint.java)
75+
Example: [io.helidon.faulttolerance.RetryConfigBlueprint](nima/fault-tolerance/fault-tolerance/src/main/java/io/helidon/nima/faulttolerance/RetryConfigBlueprint.java)
7676

7777
# Getters and Setters
7878
1. We do not use the verb, e.g. when a property "port" exists, the following methods are used:

‎THIRD_PARTY_LICENSES.txt‎

Lines changed: 105 additions & 105 deletions
Large diffs are not rendered by default.

‎applications/nima/pom.xml‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎applications/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
<modules>
3636
<module>parent</module>
37-
<module>nima</module>
3837
<module>se</module>
3938
<module>mp</module>
4039
</modules>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<value>io.helidon.microprofile.faulttolerance</value>
4949
</list>
5050
<list key="Main-helidon-imports">
51-
<value>io.helidon.common.http.Http</value>
51+
<value>io.helidon.http.Http</value>
5252
</list>
5353
<list key="Main-other-imports" if="${flavor} != 'nima'">
5454
<value>java.util.concurrent.TimeoutException</value>

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<value key="artifactId">jakarta.json-api</value>
4040
</map>
4141
<map>
42-
<value key="groupId">io.helidon.nima.http.media</value>
43-
<value key="artifactId">helidon-nima-http-media-jsonp</value>
42+
<value key="groupId">io.helidon.http.media</value>
43+
<value key="artifactId">helidon-http-media-jsonp</value>
4444
</map>
4545
</list>
4646
<list key="Main-routing-builder">
@@ -103,8 +103,8 @@
103103
<value key="scope">runtime</value>
104104
</map>
105105
<map order="500" if="${flavor} == 'nima'">
106-
<value key="groupId">io.helidon.nima.http.media</value>
107-
<value key="artifactId">helidon-nima-http-media-jsonb</value>
106+
<value key="groupId">io.helidon.http.media</value>
107+
<value key="artifactId">helidon-http-media-jsonb</value>
108108
</map>
109109
</list>
110110
<list key="Main-routing-builder" if="${flavor} == 'nima'">
@@ -147,16 +147,16 @@
147147
<value key="artifactId">jersey-media-multipart</value>
148148
</map>
149149
<map order="500" if="${flavor} == 'nima'">
150-
<value key="groupId">io.helidon.nima.http.media</value>
151-
<value key="artifactId">helidon-nima-http-media-multipart</value>
150+
<value key="groupId">io.helidon.http.media</value>
151+
<value key="artifactId">helidon-http-media-multipart</value>
152152
</map>
153153
<map order="500" if="${flavor} == 'nima'">
154-
<value key="groupId">io.helidon.nima.http.media</value>
155-
<value key="artifactId">helidon-nima-http-media-jsonp</value>
154+
<value key="groupId">io.helidon.http.media</value>
155+
<value key="artifactId">helidon-http-media-jsonp</value>
156156
</map>
157157
<map order="500" if="${flavor} == 'nima'">
158-
<value key="groupId">io.helidon.nima.webserver</value>
159-
<value key="artifactId">helidon-nima-webserver-static-content</value>
158+
<value key="groupId">io.helidon.webserver</value>
159+
<value key="artifactId">helidon-webserver-static-content</value>
160160
</map>
161161
<map order="500" if="${flavor} == 'nima'">
162162
<value key="groupId">jakarta.json</value>
@@ -165,17 +165,17 @@
165165
</list>
166166
<list key="modules" if="${flavor} == 'nima'">
167167
<value>jakarta.json</value>
168-
<value>io.helidon.nima.http.media.multipart</value>
169-
<value>io.helidon.nima.webserver.staticcontent</value>
168+
<value>io.helidon.http.media.multipart</value>
169+
<value>io.helidon.webserver.staticcontent</value>
170170
</list>
171171
<list key="modules" if="${flavor} == 'mp'">
172172
<value>jakarta.json</value>
173173
<value>jersey.media.multipart</value>
174174
</list>
175175
<list key="Main-helidon-imports" if="${flavor} == 'nima'">
176-
<value>io.helidon.common.http.Http</value>
177-
<value>io.helidon.common.http.Http.Header</value>
178-
<value>io.helidon.nima.webserver.staticcontent.StaticContentService</value>
176+
<value>io.helidon.http.Http</value>
177+
<value>io.helidon.http.Http.Header</value>
178+
<value>io.helidon.webserver.staticcontent.StaticContentService</value>
179179
</list>
180180
<list key="Main-routing-builder" if="${flavor} == 'nima'">
181181
<value order="1"><![CDATA[.any("/", (req, res) -> {

‎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
@@ -1,6 +1,6 @@
11
package {{package}};
22

3-
import io.helidon.common.http.Http;
3+
import io.helidon.http.Http;
44
import io.helidon.config.Config;
55
import io.helidon.cors.CrossOriginConfig;
66
import io.helidon.microprofile.tests.junit5.HelidonTest;

‎archetypes/helidon/src/main/archetype/nima/common/common-nima.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
<output>
2525
<model>
2626
<value key="mainClass">${package}.Main</value>
27-
<value key="parent-artifactId">helidon-nima</value>
27+
<value key="parent-artifactId">helidon-se</value>
2828
<list key="dependencies">
2929
<map order="999">
30-
<value key="groupId">io.helidon.nima.webserver</value>
31-
<value key="artifactId">helidon-nima-webserver</value>
30+
<value key="groupId">io.helidon.webserver</value>
31+
<value key="artifactId">helidon-webserver</value>
3232
</map>
3333
<map order="999">
3434
<value key="groupId">io.helidon.config</value>
@@ -45,23 +45,23 @@
4545
<value key="scope">test</value>
4646
</map>
4747
<map order="0">
48-
<value key="groupId">io.helidon.nima.testing.junit5</value>
49-
<value key="artifactId">helidon-nima-testing-junit5-webserver</value>
48+
<value key="groupId">io.helidon.webserver.testing.junit5</value>
49+
<value key="artifactId">helidon-webserver-testing-junit5</value>
5050
<value key="scope">test</value>
5151
</map>
5252
</list>
5353
<list key="Main-helidon-imports">
5454
<value>io.helidon.logging.common.LogConfig</value>
5555
<value>io.helidon.config.Config</value>
56-
<value>io.helidon.nima.webserver.WebServer</value>
57-
<value>io.helidon.nima.webserver.http.HttpRouting</value>
56+
<value>io.helidon.webserver.WebServer</value>
57+
<value>io.helidon.webserver.http.HttpRouting</value>
5858
</list>
5959
<list key="MainTest-helidon-imports">
60-
<value>io.helidon.common.http.Http</value>
61-
<value>io.helidon.nima.testing.junit5.webserver.SetUpRoute</value>
62-
<value>io.helidon.nima.webclient.http1.Http1Client</value>
63-
<value>io.helidon.nima.webclient.http1.Http1ClientResponse</value>
64-
<value>io.helidon.nima.webserver.http.HttpRouting</value>
60+
<value>io.helidon.http.Http</value>
61+
<value>io.helidon.webserver.testing.junit5.SetUpRoute</value>
62+
<value>io.helidon.webclient.http1.Http1Client</value>
63+
<value>io.helidon.webclient.http1.Http1ClientResponse</value>
64+
<value>io.helidon.webserver.http.HttpRouting</value>
6565
</list>
6666
<list key="MainTest-other-imports">
6767
<value>org.junit.jupiter.api.Test</value>
@@ -71,8 +71,8 @@
7171
<value>static org.hamcrest.Matchers.is</value>
7272
</list>
7373
<list key="modules">
74-
<value>io.helidon.nima.webserver</value>
75-
<value>io.helidon.common.http</value>
74+
<value>io.helidon.webserver</value>
75+
<value>io.helidon.http</value>
7676
<value>io.helidon.config</value>
7777
</list>
7878
</model>

‎archetypes/helidon/src/main/archetype/nima/common/files/src/main/resources/logging.properties.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ handlers=java.util.logging.ConsoleHandler
22
java.util.logging.SimpleFormatter.format=%1$tY.%1$tm.%1$td %1$tH:%1$tM:%1$tS.%1$tL %5$s%6$s%n
33
# Global logging level. Can be overridden by specific loggers
44
.level=INFO
5-
io.helidon.nima.level=INFO
5+
io.helidon.webserver.level=INFO

‎archetypes/helidon/src/main/archetype/nima/common/files/src/test/java/__pkg__/MainIT.java.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package {{package}};
22

3-
import io.helidon.nima.testing.junit5.webserver.ServerTest;
4-
import io.helidon.nima.webclient.http1.Http1Client;
3+
import io.helidon.webclient.http1.Http1Client;
4+
import io.helidon.webserver.testing.junit5.ServerTest;
55

66
@ServerTest
77
class MainIT extends AbstractMainTest {

0 commit comments

Comments
 (0)