Skip to content

Commit f65b936

Browse files
authored
Fix namespaces, JPMS module naming, display names (#623)
1 parent b80a607 commit f65b936

File tree

112 files changed

+201
-196
lines changed

Some content is hidden

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

112 files changed

+201
-196
lines changed

auth-api/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44

55
description = "This module provides the auth API"
66

7-
extra["displayName"] = "Smithy :: Java :: Auth API"
8-
extra["moduleName"] = "software.amazon.smithy.java.auth-api"
7+
extra["displayName"] = "Smithy :: Java :: Auth :: API"
8+
extra["moduleName"] = "software.amazon.smithy.java.auth.api"
99

1010
dependencies {
1111
api(project(":context"))

aws/aws-event-streams/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
description = "This module provides AWS event streaming support"
66

77
extra["displayName"] = "Smithy :: Java :: AWS :: Event Streams"
8-
extra["moduleName"] = "software.amazon.smithy.java.aws.event-streams"
8+
extra["moduleName"] = "software.amazon.smithy.java.aws.events"
99

1010
dependencies {
1111
api(project(":core"))

aws/aws-event-streams/src/main/java/software/amazon/smithy/java/events/aws/AwsEventDecoderFactory.java aws/aws-event-streams/src/main/java/software/amazon/smithy/java/aws/events/AwsEventDecoderFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.events.aws;
6+
package software.amazon.smithy.java.aws.events;
77

88
import java.util.function.Supplier;
99
import software.amazon.smithy.java.core.schema.InputEventStreamingApiOperation;

aws/aws-event-streams/src/main/java/software/amazon/smithy/java/events/aws/AwsEventDeserializer.java aws/aws-event-streams/src/main/java/software/amazon/smithy/java/aws/events/AwsEventDeserializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.events.aws;
6+
package software.amazon.smithy.java.aws.events;
77

88
import software.amazon.smithy.java.core.schema.Schema;
99
import software.amazon.smithy.java.core.serde.ShapeDeserializer;

aws/aws-event-streams/src/main/java/software/amazon/smithy/java/events/aws/AwsEventEncoderFactory.java aws/aws-event-streams/src/main/java/software/amazon/smithy/java/aws/events/AwsEventEncoderFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.events.aws;
6+
package software.amazon.smithy.java.aws.events;
77

88
import java.util.function.Function;
99
import software.amazon.smithy.java.core.schema.InputEventStreamingApiOperation;

aws/aws-event-streams/src/main/java/software/amazon/smithy/java/events/aws/AwsEventFrame.java aws/aws-event-streams/src/main/java/software/amazon/smithy/java/aws/events/AwsEventFrame.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.events.aws;
6+
package software.amazon.smithy.java.aws.events;
77

88
import software.amazon.eventstream.Message;
99
import software.amazon.smithy.java.core.serde.event.Frame;

aws/aws-event-streams/src/main/java/software/amazon/smithy/java/events/aws/AwsEventShapeDecoder.java aws/aws-event-streams/src/main/java/software/amazon/smithy/java/aws/events/AwsEventShapeDecoder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.events.aws;
6+
package software.amazon.smithy.java.aws.events;
77

88
import java.util.function.Supplier;
99
import software.amazon.eventstream.Message;

aws/aws-event-streams/src/main/java/software/amazon/smithy/java/events/aws/AwsEventShapeEncoder.java aws/aws-event-streams/src/main/java/software/amazon/smithy/java/aws/events/AwsEventShapeEncoder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.events.aws;
6+
package software.amazon.smithy.java.aws.events;
77

88
import java.io.ByteArrayOutputStream;
99
import java.util.HashMap;

aws/aws-event-streams/src/main/java/software/amazon/smithy/java/events/aws/AwsFrameDecoder.java aws/aws-event-streams/src/main/java/software/amazon/smithy/java/aws/events/AwsFrameDecoder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.events.aws;
6+
package software.amazon.smithy.java.aws.events;
77

88
import java.nio.ByteBuffer;
99
import java.util.List;

aws/aws-event-streams/src/main/java/software/amazon/smithy/java/events/aws/AwsFrameEncoder.java aws/aws-event-streams/src/main/java/software/amazon/smithy/java/aws/events/AwsFrameEncoder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.events.aws;
6+
package software.amazon.smithy.java.aws.events;
77

88
import java.nio.ByteBuffer;
99
import software.amazon.smithy.java.core.serde.event.FrameEncoder;

aws/aws-sigv4/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
description = "This module provides AWS-Specific Sigv4 Signing capabilities"
1010

11-
extra["displayName"] = "Smithy :: Java :: AWS :: Sigv4"
11+
extra["displayName"] = "Smithy :: Java :: AWS :: SigV4"
1212
extra["moduleName"] = "software.amazon.smithy.java.aws.sigv4"
1313

1414
dependencies {

aws/client/aws-client-awsjson/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
description = "This module provides the implementation of AWS JSON protocols"
77

8-
extra["displayName"] = "Smithy :: Java :: Client AWS JSON 1.0 and 1.1"
8+
extra["displayName"] = "Smithy :: Java :: AWS :: Client :: AWS JSON"
99
extra["moduleName"] = "software.amazon.smithy.java.aws.client.awsjson"
1010

1111
dependencies {

aws/client/aws-client-core/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
description = "This module provides AWS-Specific client functionality"
66

7-
extra["displayName"] = "Smithy :: Java :: AWS :: Client-Core"
7+
extra["displayName"] = "Smithy :: Java :: AWS :: Client :: Core"
88
extra["moduleName"] = "software.amazon.smithy.java.aws.client.core"
99

1010
dependencies {

aws/client/aws-client-restjson/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
description = "This module provides the implementation of AWS REST JSON"
77

8-
extra["displayName"] = "Smithy :: Java :: Client AWS REST JSON"
8+
extra["displayName"] = "Smithy :: Java :: AWS :: Client :: REST JSON"
99
extra["moduleName"] = "software.amazon.smithy.java.aws.client.restjson"
1010

1111
dependencies {

aws/client/aws-client-restjson/src/main/java/software/amazon/smithy/java/aws/client/restjson/RestJsonClientProtocol.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
package software.amazon.smithy.java.aws.client.restjson;
77

88
import software.amazon.smithy.aws.traits.protocols.RestJson1Trait;
9+
import software.amazon.smithy.java.aws.events.AwsEventDecoderFactory;
10+
import software.amazon.smithy.java.aws.events.AwsEventEncoderFactory;
11+
import software.amazon.smithy.java.aws.events.AwsEventFrame;
912
import software.amazon.smithy.java.client.core.ClientProtocol;
1013
import software.amazon.smithy.java.client.core.ClientProtocolFactory;
1114
import software.amazon.smithy.java.client.core.ProtocolSettings;
@@ -20,9 +23,6 @@
2023
import software.amazon.smithy.java.core.serde.event.EventDecoderFactory;
2124
import software.amazon.smithy.java.core.serde.event.EventEncoderFactory;
2225
import software.amazon.smithy.java.core.serde.event.EventStreamingException;
23-
import software.amazon.smithy.java.events.aws.AwsEventDecoderFactory;
24-
import software.amazon.smithy.java.events.aws.AwsEventEncoderFactory;
25-
import software.amazon.smithy.java.events.aws.AwsEventFrame;
2626
import software.amazon.smithy.java.json.JsonCodec;
2727
import software.amazon.smithy.model.shapes.ShapeId;
2828

aws/client/aws-client-restxml/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
description = "This module provides the implementation of AWS REST XML"
77

8-
extra["displayName"] = "Smithy :: Java :: Client AWS REST XML"
8+
extra["displayName"] = "Smithy :: Java :: AWS :: Client :: REST XML"
99
extra["moduleName"] = "software.amazon.smithy.java.aws.client.restxml"
1010

1111
dependencies {

aws/client/aws-client-restxml/src/main/java/software/amazon/smithy/java/aws/client/restxml/RestXmlClientProtocol.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
package software.amazon.smithy.java.aws.client.restxml;
77

88
import software.amazon.smithy.aws.traits.protocols.RestXmlTrait;
9+
import software.amazon.smithy.java.aws.events.AwsEventDecoderFactory;
10+
import software.amazon.smithy.java.aws.events.AwsEventEncoderFactory;
11+
import software.amazon.smithy.java.aws.events.AwsEventFrame;
912
import software.amazon.smithy.java.client.core.ClientProtocol;
1013
import software.amazon.smithy.java.client.core.ClientProtocolFactory;
1114
import software.amazon.smithy.java.client.core.ProtocolSettings;
@@ -20,9 +23,6 @@
2023
import software.amazon.smithy.java.core.serde.event.EventDecoderFactory;
2124
import software.amazon.smithy.java.core.serde.event.EventEncoderFactory;
2225
import software.amazon.smithy.java.core.serde.event.EventStreamingException;
23-
import software.amazon.smithy.java.events.aws.AwsEventDecoderFactory;
24-
import software.amazon.smithy.java.events.aws.AwsEventEncoderFactory;
25-
import software.amazon.smithy.java.events.aws.AwsEventFrame;
2626
import software.amazon.smithy.java.xml.XmlCodec;
2727
import software.amazon.smithy.model.shapes.ShapeId;
2828

aws/integrations/aws-lambda-endpoint/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description = """
66
This module provides a basic endpoint implementation that may be used to back an AWS Lambda request handler
77
"""
88

9-
extra["displayName"] = "Smithy :: Java :: AWS :: Integrations :: Lambda"
9+
extra["displayName"] = "Smithy :: Java :: AWS :: Integrations :: Lambda Endpoint"
1010
extra["moduleName"] = "software.amazon.smithy.java.aws.integrations.lambda"
1111

1212
dependencies {

aws/sdkv2/aws-sdkv2-retries/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
description = "This module provides an adapter that allows Smithy Java to use retry strategies from the AWS SDK for Java V2"
66

7-
extra["displayName"] = "Smithy :: Java :: AWS :: AWS SDK v2 :: Retries adapter"
7+
extra["displayName"] = "Smithy :: Java :: AWS :: SDKv2 :: Retries Adapter"
88
extra["moduleName"] = "software.amazon.smithy.java.aws.sdkv2.retries"
99

1010
dependencies {

aws/sdkv2/aws-sdkv2-shapes/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
description = "This module allows for converting between Smithy Java and AWS SDK for Java V2 documents"
66

7-
extra["displayName"] = "Smithy :: Java :: AWS :: SDK V2 :: Shapes"
7+
extra["displayName"] = "Smithy :: Java :: AWS :: SDKv2 :: Shapes"
88
extra["moduleName"] = "software.amazon.smithy.java.aws.sdkv2.shapes"
99

1010
dependencies {

aws/server/aws-server-restjson/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ plugins {
55

66
description = "This module provides the AWS RestJson1 support for servers."
77

8-
extra["displayName"] = "Smithy :: Java :: Server AWS RestJson1"
9-
extra["moduleName"] = "software.amazon.smithy.java.server-aws-rest-json1"
8+
extra["displayName"] = "Smithy :: Java :: AWS :: Server :: REST JSON"
9+
extra["moduleName"] = "software.amazon.smithy.java.aws.server.restjson"
1010

1111
dependencies {
1212
api(project(":server:server-api"))
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson;
6+
package software.amazon.smithy.java.aws.server.restjson;
77

88
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
99

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson;
6+
package software.amazon.smithy.java.aws.server.restjson;
77

88
import static java.util.stream.Collectors.toUnmodifiableMap;
99

@@ -12,6 +12,11 @@
1212
import java.util.Map;
1313
import java.util.concurrent.CompletableFuture;
1414
import software.amazon.smithy.aws.traits.protocols.RestJson1Trait;
15+
import software.amazon.smithy.java.aws.server.restjson.router.UriMatcherMap;
16+
import software.amazon.smithy.java.aws.server.restjson.router.UriMatcherMapBuilder;
17+
import software.amazon.smithy.java.aws.server.restjson.router.UriPattern;
18+
import software.amazon.smithy.java.aws.server.restjson.router.UriTreeMatcherMap;
19+
import software.amazon.smithy.java.aws.server.restjson.router.ValuedMatch;
1520
import software.amazon.smithy.java.context.Context;
1621
import software.amazon.smithy.java.core.schema.SerializableStruct;
1722
import software.amazon.smithy.java.core.schema.TraitKey;
@@ -30,11 +35,6 @@
3035
import software.amazon.smithy.java.server.core.ServerProtocol;
3136
import software.amazon.smithy.java.server.core.ServiceProtocolResolutionRequest;
3237
import software.amazon.smithy.java.server.core.ServiceProtocolResolutionResult;
33-
import software.amazon.smithy.java.server.protocols.restjson.router.UriMatcherMap;
34-
import software.amazon.smithy.java.server.protocols.restjson.router.UriMatcherMapBuilder;
35-
import software.amazon.smithy.java.server.protocols.restjson.router.UriPattern;
36-
import software.amazon.smithy.java.server.protocols.restjson.router.UriTreeMatcherMap;
37-
import software.amazon.smithy.java.server.protocols.restjson.router.ValuedMatch;
3838
import software.amazon.smithy.model.pattern.SmithyPattern;
3939
import software.amazon.smithy.model.shapes.ShapeId;
4040

Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson;
6+
package software.amazon.smithy.java.aws.server.restjson;
77

88
import java.util.List;
99
import software.amazon.smithy.aws.traits.protocols.RestJson1Trait;
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson.router;
6+
package software.amazon.smithy.java.aws.server.restjson.router;
77

88
import java.util.ArrayList;
99
import java.util.List;
1010
import java.util.Objects;
1111
import java.util.regex.Pattern;
12-
import software.amazon.smithy.java.server.protocols.restjson.router.PathPattern.Segment;
12+
import software.amazon.smithy.java.aws.server.restjson.router.PathPattern.Segment;
1313

1414
/**
1515
* Simple URI path matcher based upon regular expressions. Capable of handling 'long' label matches which span segments
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson.router;
6+
package software.amazon.smithy.java.aws.server.restjson.router;
77

88
import java.util.List;
99
import java.util.Objects;
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson.router;
6+
package software.amazon.smithy.java.aws.server.restjson.router;
77

8-
import software.amazon.smithy.java.server.protocols.restjson.router.PathPattern.Segment;
8+
import software.amazon.smithy.java.aws.server.restjson.router.PathPattern.Segment;
99

1010
/**
1111
* A URI Path Matcher that allows empty segments.
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson.router;
6+
package software.amazon.smithy.java.aws.server.restjson.router;
77

88
import software.amazon.smithy.java.io.uri.QueryStringParser;
99

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson.router;
6+
package software.amazon.smithy.java.aws.server.restjson.router;
77

88
import java.util.ArrayList;
99
import java.util.List;
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson.router;
6+
package software.amazon.smithy.java.aws.server.restjson.router;
77

88
import java.util.ArrayList;
99
import java.util.HashMap;
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson.router;
6+
package software.amazon.smithy.java.aws.server.restjson.router;
77

88
import java.util.List;
99

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson.router;
6+
package software.amazon.smithy.java.aws.server.restjson.router;
77

88
import java.util.List;
99

Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson.router;
6+
package software.amazon.smithy.java.aws.server.restjson.router;
77

88
import java.util.function.Supplier;
99

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson.router;
6+
package software.amazon.smithy.java.aws.server.restjson.router;
77

88
import java.util.List;
99

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson.router;
6+
package software.amazon.smithy.java.aws.server.restjson.router;
77

88
import java.util.ArrayList;
99
import java.util.Collections;
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson.router;
6+
package software.amazon.smithy.java.aws.server.restjson.router;
77

88
import java.util.Collection;
99
import java.util.HashMap;
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package software.amazon.smithy.java.server.protocols.restjson.router;
6+
package software.amazon.smithy.java.aws.server.restjson.router;
77

88
import java.util.HashSet;
99
import java.util.Set;

0 commit comments

Comments
 (0)