Skip to content

Commit

Permalink
Uplevel Nima
Browse files Browse the repository at this point in the history 
Fixes #7164
Fixes #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/mtl (to get rid of 'nima' references)
  • Loading branch information
@romain-grecourt
romain-grecourt committed Aug 15, 2023
1 parent 93473ba commit 4d59a15
Show file tree
Hide file tree
Showing 2,428 changed files with 30,947 additions and 33,733 deletions.
2 changes: 1 addition & 1 deletion DEV-GUIDELINES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Some of these rules are enforced by checkstyle, some are checked during code rev
configured (e.g. a component may expect tracing endpoint - if not defined, tracing may be disabled)
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)

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

# Getters and Setters
1. We do not use the verb, e.g. when a property "port" exists, the following methods are used:
Expand Down
210 changes: 105 additions & 105 deletions THIRD_PARTY_LICENSES.txt
View file

Large diffs are not rendered by default.

88 changes: 0 additions & 88 deletions applications/nima/pom.xml
View file

This file was deleted.

1 change: 0 additions & 1 deletion applications/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

<modules>
<module>parent</module>
<module>nima</module>
<module>se</module>
<module>mp</module>
</modules>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/helidon/src/main/archetype/common/extra.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<value>io.helidon.microprofile.faulttolerance</value>
</list>
<list key="Main-helidon-imports">
<value>io.helidon.common.http.Http</value>
<value>io.helidon.http.Http</value>
</list>
<list key="Main-other-imports" if="${flavor} != 'nima'">
<value>java.util.concurrent.TimeoutException</value>
Expand Down
30 changes: 15 additions & 15 deletions archetypes/helidon/src/main/archetype/common/media.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<value key="artifactId">jakarta.json-api</value>
</map>
<map>
<value key="groupId">io.helidon.nima.http.media</value>
<value key="artifactId">helidon-nima-http-media-jsonp</value>
<value key="groupId">io.helidon.http.media</value>
<value key="artifactId">helidon-http-media-jsonp</value>
</map>
</list>
<list key="Main-routing-builder">
Expand Down Expand Up @@ -103,8 +103,8 @@
<value key="scope">runtime</value>
</map>
<map order="500" if="${flavor} == 'nima'">
<value key="groupId">io.helidon.nima.http.media</value>
<value key="artifactId">helidon-nima-http-media-jsonb</value>
<value key="groupId">io.helidon.http.media</value>
<value key="artifactId">helidon-http-media-jsonb</value>
</map>
</list>
<list key="Main-routing-builder" if="${flavor} == 'nima'">
Expand Down Expand Up @@ -147,16 +147,16 @@
<value key="artifactId">jersey-media-multipart</value>
</map>
<map order="500" if="${flavor} == 'nima'">
<value key="groupId">io.helidon.nima.http.media</value>
<value key="artifactId">helidon-nima-http-media-multipart</value>
<value key="groupId">io.helidon.http.media</value>
<value key="artifactId">helidon-http-media-multipart</value>
</map>
<map order="500" if="${flavor} == 'nima'">
<value key="groupId">io.helidon.nima.http.media</value>
<value key="artifactId">helidon-nima-http-media-jsonp</value>
<value key="groupId">io.helidon.http.media</value>
<value key="artifactId">helidon-http-media-jsonp</value>
</map>
<map order="500" if="${flavor} == 'nima'">
<value key="groupId">io.helidon.nima.webserver</value>
<value key="artifactId">helidon-nima-webserver-static-content</value>
<value key="groupId">io.helidon.webserver</value>
<value key="artifactId">helidon-webserver-static-content</value>
</map>
<map order="500" if="${flavor} == 'nima'">
<value key="groupId">jakarta.json</value>
Expand All @@ -165,17 +165,17 @@
</list>
<list key="modules" if="${flavor} == 'nima'">
<value>jakarta.json</value>
<value>io.helidon.nima.http.media.multipart</value>
<value>io.helidon.nima.webserver.staticcontent</value>
<value>io.helidon.http.media.multipart</value>
<value>io.helidon.webserver.staticcontent</value>
</list>
<list key="modules" if="${flavor} == 'mp'">
<value>jakarta.json</value>
<value>jersey.media.multipart</value>
</list>
<list key="Main-helidon-imports" if="${flavor} == 'nima'">
<value>io.helidon.common.http.Http</value>
<value>io.helidon.common.http.Http.Header</value>
<value>io.helidon.nima.webserver.staticcontent.StaticContentService</value>
<value>io.helidon.http.Http</value>
<value>io.helidon.http.Http.Header</value>
<value>io.helidon.webserver.staticcontent.StaticContentService</value>
</list>
<list key="Main-routing-builder" if="${flavor} == 'nima'">
<value order="1"><![CDATA[.any("/", (req, res) -> {
Expand Down
2 changes: 1 addition & 1 deletion ...s/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/TestCORS.java.mustache
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package {{package}};

import io.helidon.common.http.Http;
import io.helidon.http.Http;
import io.helidon.config.Config;
import io.helidon.cors.CrossOriginConfig;
import io.helidon.microprofile.tests.junit5.HelidonTest;
Expand Down
28 changes: 14 additions & 14 deletions archetypes/helidon/src/main/archetype/nima/common/common-nima.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
<output>
<model>
<value key="mainClass">${package}.Main</value>
<value key="parent-artifactId">helidon-nima</value>
<value key="parent-artifactId">helidon-se</value>
<list key="dependencies">
<map order="999">
<value key="groupId">io.helidon.nima.webserver</value>
<value key="artifactId">helidon-nima-webserver</value>
<value key="groupId">io.helidon.webserver</value>
<value key="artifactId">helidon-webserver</value>
</map>
<map order="999">
<value key="groupId">io.helidon.config</value>
Expand All @@ -45,23 +45,23 @@
<value key="scope">test</value>
</map>
<map order="0">
<value key="groupId">io.helidon.nima.testing.junit5</value>
<value key="artifactId">helidon-nima-testing-junit5-webserver</value>
<value key="groupId">io.helidon.webserver.testing.junit5</value>
<value key="artifactId">helidon-webserver-testing-junit5</value>
<value key="scope">test</value>
</map>
</list>
<list key="Main-helidon-imports">
<value>io.helidon.logging.common.LogConfig</value>
<value>io.helidon.config.Config</value>
<value>io.helidon.nima.webserver.WebServer</value>
<value>io.helidon.nima.webserver.http.HttpRouting</value>
<value>io.helidon.webserver.WebServer</value>
<value>io.helidon.webserver.http.HttpRouting</value>
</list>
<list key="MainTest-helidon-imports">
<value>io.helidon.common.http.Http</value>
<value>io.helidon.nima.testing.junit5.webserver.SetUpRoute</value>
<value>io.helidon.nima.webclient.http1.Http1Client</value>
<value>io.helidon.nima.webclient.http1.Http1ClientResponse</value>
<value>io.helidon.nima.webserver.http.HttpRouting</value>
<value>io.helidon.http.Http</value>
<value>io.helidon.webserver.testing.junit5.SetUpRoute</value>
<value>io.helidon.webclient.http1.Http1Client</value>
<value>io.helidon.webclient.http1.Http1ClientResponse</value>
<value>io.helidon.webserver.http.HttpRouting</value>
</list>
<list key="MainTest-other-imports">
<value>org.junit.jupiter.api.Test</value>
Expand All @@ -71,8 +71,8 @@
<value>static org.hamcrest.Matchers.is</value>
</list>
<list key="modules">
<value>io.helidon.nima.webserver</value>
<value>io.helidon.common.http</value>
<value>io.helidon.webserver</value>
<value>io.helidon.http</value>
<value>io.helidon.config</value>
</list>
</model>
Expand Down
2 changes: 1 addition & 1 deletion ...lidon/src/main/archetype/nima/common/files/src/main/resources/logging.properties.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ handlers=java.util.logging.ConsoleHandler
java.util.logging.SimpleFormatter.format=%1$tY.%1$tm.%1$td %1$tH:%1$tM:%1$tS.%1$tL %5$s%6$s%n
# Global logging level. Can be overridden by specific loggers
.level=INFO
io.helidon.nima.level=INFO
io.helidon.webserver.level=INFO
4 changes: 2 additions & 2 deletions ...s/helidon/src/main/archetype/nima/common/files/src/test/java/__pkg__/MainIT.java.mustache
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package {{package}};

import io.helidon.nima.testing.junit5.webserver.ServerTest;
import io.helidon.nima.webclient.http1.Http1Client;
import io.helidon.webclient.http1.Http1Client;
import io.helidon.webserver.testing.junit5.ServerTest;

@ServerTest
class MainIT extends AbstractMainTest {
Expand Down
4 changes: 2 additions & 2 deletions ...helidon/src/main/archetype/nima/common/files/src/test/java/__pkg__/MainTest.java.mustache
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package {{package}};

import io.helidon.nima.testing.junit5.webserver.DirectClient;
import io.helidon.nima.testing.junit5.webserver.RoutingTest;
import io.helidon.webserver.testing.junit5.DirectClient;
import io.helidon.webserver.testing.junit5.RoutingTest;

@RoutingTest
class MainTest extends AbstractMainTest {
Expand Down
12 changes: 6 additions & 6 deletions archetypes/helidon/src/main/archetype/nima/custom/extra.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
<model>
<list key="dependencies">
<map if="${extra} contains 'fault-tolerance'">
<value key="groupId">io.helidon.nima.fault-tolerance</value>
<value key="artifactId">helidon-nima-fault-tolerance</value>
<value key="groupId">io.helidon.fault-tolerance</value>
<value key="artifactId">helidon-fault-tolerance</value>
</map>
</list>
<list key="Main-helidon-imports" if="${extra} contains 'fault-tolerance'">
<value>io.helidon.common.http.Http</value>
<value>io.helidon.nima.faulttolerance.BulkheadException</value>
<value>io.helidon.nima.faulttolerance.CircuitBreakerOpenException</value>
<value>io.helidon.nima.faulttolerance.TimeoutException</value>
<value>io.helidon.http.Http</value>
<value>io.helidon.faulttolerance.BulkheadException</value>
<value>io.helidon.faulttolerance.CircuitBreakerOpenException</value>
<value>io.helidon.faulttolerance.TimeoutException</value>
</list>
<list key="Main-routing-builder" if="${extra} contains 'fault-tolerance'">
<value><![CDATA[.register("/", new FtService())
Expand Down
26 changes: 13 additions & 13 deletions ...ain/archetype/nima/custom/files/src/main/java/__pkg__/FileService.java.multipart.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ import java.nio.file.StandardOpenOption;
import java.util.Map;
import java.util.stream.Stream;

import io.helidon.common.http.ContentDisposition;
import io.helidon.common.http.Http;
import io.helidon.common.http.Http.Header;
import io.helidon.common.http.ServerResponseHeaders;
import io.helidon.http.ContentDisposition;
import io.helidon.http.Http;
import io.helidon.http.Http.Header;
import io.helidon.http.ServerResponseHeaders;
import io.helidon.common.media.type.MediaTypes;
import io.helidon.nima.http.media.multipart.MultiPart;
import io.helidon.nima.http.media.multipart.ReadablePart;
import io.helidon.nima.webserver.http.HttpRules;
import io.helidon.nima.webserver.http.HttpService;
import io.helidon.nima.webserver.http.ServerRequest;
import io.helidon.nima.webserver.http.ServerResponse;
import io.helidon.http.media.multipart.MultiPart;
import io.helidon.http.media.multipart.ReadablePart;
import io.helidon.webserver.http.HttpRules;
import io.helidon.webserver.http.HttpService;
import io.helidon.webserver.http.ServerRequest;
import io.helidon.webserver.http.ServerResponse;

import jakarta.json.Json;
import jakarta.json.JsonArrayBuilder;
import jakarta.json.JsonBuilderFactory;

import static io.helidon.common.http.Http.Status.BAD_REQUEST_400;
import static io.helidon.common.http.Http.Status.MOVED_PERMANENTLY_301;
import static io.helidon.common.http.Http.Status.NOT_FOUND_404;
import static io.helidon.http.Http.Status.BAD_REQUEST_400;
import static io.helidon.http.Http.Status.MOVED_PERMANENTLY_301;
import static io.helidon.http.Http.Status.NOT_FOUND_404;

/**
* File service.
Expand Down
22 changes: 11 additions & 11 deletions ...elidon/src/main/archetype/nima/custom/files/src/main/java/__pkg__/FtService.java.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicInteger;

import io.helidon.nima.faulttolerance.Async;
import io.helidon.nima.faulttolerance.Bulkhead;
import io.helidon.nima.faulttolerance.CircuitBreaker;
import io.helidon.nima.faulttolerance.Fallback;
import io.helidon.nima.faulttolerance.FallbackConfig;
import io.helidon.nima.faulttolerance.Retry;
import io.helidon.nima.faulttolerance.Timeout;
import io.helidon.nima.webserver.http.HttpRules;
import io.helidon.nima.webserver.http.HttpService;
import io.helidon.nima.webserver.http.ServerRequest;
import io.helidon.nima.webserver.http.ServerResponse;
import io.helidon.faulttolerance.Async;
import io.helidon.faulttolerance.Bulkhead;
import io.helidon.faulttolerance.CircuitBreaker;
import io.helidon.faulttolerance.Fallback;
import io.helidon.faulttolerance.FallbackConfig;
import io.helidon.faulttolerance.Retry;
import io.helidon.faulttolerance.Timeout;
import io.helidon.webserver.http.HttpRules;
import io.helidon.webserver.http.HttpService;
import io.helidon.webserver.http.ServerRequest;
import io.helidon.webserver.http.ServerResponse;

public class FtService implements HttpService {
Expand Down
10 changes: 5 additions & 5 deletions ...rc/main/archetype/nima/custom/files/src/main/java/__pkg__/GreetService.java.json.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package {{package}};

import java.util.concurrent.atomic.AtomicReference;

import io.helidon.common.http.Http;
import io.helidon.nima.webserver.http.HttpRules;
import io.helidon.nima.webserver.http.HttpService;
import io.helidon.nima.webserver.http.ServerRequest;
import io.helidon.nima.webserver.http.ServerResponse;
import io.helidon.http.Http;
import io.helidon.webserver.http.HttpRules;
import io.helidon.webserver.http.HttpService;
import io.helidon.webserver.http.ServerRequest;
import io.helidon.webserver.http.ServerResponse;

public class GreetService implements HttpService {
Expand Down
Loading

0 comments on commit 4d59a15

Please sign in to comment.