Skip to content

Commit b27e961

Browse files
authored
Update codegen (#571)
1 parent babbe2c commit b27e961

File tree

62 files changed

+262
-17
lines changed

Some content is hidden

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

62 files changed

+262
-17
lines changed

sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCClient.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import software.amazon.awssdk.crt.eventstream.ClientConnectionContinuation;
@@ -145,7 +150,7 @@ protected void onContinuationMessage(List<Header> headers, byte[] payload, Messa
145150
}
146151
}
147152
}
148-
153+
149154
@Override
150155
protected void onContinuationClosed() {
151156
super.onContinuationClosed();
@@ -169,10 +174,8 @@ protected void onContinuationClosed() {
169174
return response;
170175
}
171176

172-
173-
174177
/**
175-
* Sends an empty close message on the open stream.
178+
* Sends an empty close message on the open stream.
176179
* @param continuation continuation to send the close message on
177180
* @return CompletableFuture indicating flush of the close message.
178181
*/

sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import software.amazon.awssdk.crt.CRT;
@@ -34,12 +39,12 @@ enum Phase {
3439
CONNECTED,
3540
CLOSING
3641
};
37-
42+
3843
Phase connectionPhase;
3944
ClientConnection connection;
4045
Throwable closeReason;
4146
boolean onConnectCalled;
42-
47+
4348
protected ConnectionState(Phase phase, ClientConnection connection) {
4449
this.connectionPhase = phase;
4550
this.connection = connection;
@@ -75,7 +80,7 @@ protected String getVersionString() {
7580

7681
/**
7782
* Connects to the event stream RPC server asynchronously
78-
*
83+
*
7984
* @return A future that completes when connected
8085
*/
8186
public CompletableFuture<Void> connect(final LifecycleHandler lifecycleHandler) {
@@ -156,7 +161,7 @@ protected void onProtocolMessage(List<Header> headers, byte[] payload, MessageTy
156161
LOGGER.warning("AccessDenied to event stream RPC server");
157162
connectionState.connectionPhase = ConnectionState.Phase.CLOSING;
158163
connectionState.connection.closeConnection(0);
159-
164+
160165
final AccessDeniedException ade = new AccessDeniedException("Connection access denied to event stream RPC server");
161166
if (!initialConnectFuture.isDone()) {
162167
initialConnectFuture.completeExceptionally(ade);
@@ -179,7 +184,7 @@ protected void onProtocolMessage(List<Header> headers, byte[] payload, MessageTy
179184
disconnect();
180185
} else if (MessageType.ProtocolError.equals(messageType) || MessageType.ServerError.equals(messageType)) {
181186
LOGGER.severe("Received " + messageType.name() + ": " + CRT.awsErrorName(CRT.awsLastError()));
182-
connectionState.closeReason = EventStreamError.create(headers, payload, messageType);
187+
connectionState.closeReason = EventStreamError.create(headers, payload, messageType);
183188
doOnError(lifecycleHandler, connectionState.closeReason);
184189
disconnect();
185190
} else {
@@ -222,7 +227,7 @@ protected void onConnectionClosed(int errorCode) {
222227
/**
223228
* Creates a new stream with the given continuation handler.
224229
* Trhows an exception if not connected
225-
*
230+
*
226231
* @param continuationHandler The continuation handler to use
227232
* @return A new ClientConnectionContinuation containing the new stream.
228233
*/
@@ -375,7 +380,7 @@ public interface LifecycleHandler {
375380
* Do nothing on ping by default. Inform handler of ping data
376381
*
377382
* TODO: Could use boolean return here as a hint on whether a pong reply should be sent?
378-
*
383+
*
379384
* @param headers The ping headers
380385
* @param payload The ping payload
381386
*/

sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnectionConfig.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import software.amazon.awssdk.crt.io.ClientBootstrap;

sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/GreengrassConnectMessageSupplier.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import com.google.gson.Gson;
@@ -13,7 +18,7 @@
1318
* The connect message supplier for Greengrass
1419
*/
1520
public class GreengrassConnectMessageSupplier {
16-
21+
1722
/**
1823
* Returns a new connect message supplier using the given token
1924
* @param authToken The auth token to use

sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/GreengrassEventStreamConnectMessage.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
/**

sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/OperationResponse.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import software.amazon.awssdk.crt.eventstream.ClientConnectionContinuation;

sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/StreamResponse.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import software.amazon.awssdk.eventstreamrpc.model.EventStreamJsonMessage;

sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/StreamResponseHandler.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
/**

sdk/greengrass/event-stream-rpc-client/src/test/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCClientTests.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import org.junit.jupiter.api.Assertions;

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/DeserializationException.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
/**

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamClosedException.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
/**

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCServiceModel.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import com.google.gson.Gson;

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/InvalidDataException.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import software.amazon.awssdk.crt.eventstream.MessageType;

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/MessageAmendInfo.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import software.amazon.awssdk.crt.eventstream.Header;
@@ -36,7 +41,7 @@ public MessageAmendInfo(List<Header> headers, byte[] payload) {
3641
* Returns the headers stored in the object. For sent messages,
3742
* the headers stored in the object may be used to append to existing headers,
3843
* where it won't overwrite an existing one that may be outgoing.
39-
*
44+
*
4045
* @return The headers stored
4146
*/
4247
public List<Header> getHeaders() {

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/OperationModelContext.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import software.amazon.awssdk.eventstreamrpc.model.EventStreamJsonMessage;
@@ -11,7 +16,7 @@
1116
* Smithy code generation should produce one of these per model, but we aren't going to take steps to prevent
1217
* hand construction.
1318
*
14-
* @param <RequestType> The initial-request
19+
* @param <RequestType> The initial-request
1520
* @param <ResponseType> The initial-response
1621
* @param <StreamingRequestType> The streaming initial-request
1722
* @param <StreamingResponseType> The streaming initial-response

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/SerializationException.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
/**

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/StreamEventPublisher.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import software.amazon.awssdk.eventstreamrpc.model.EventStreamJsonMessage;

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/UnmappedDataException.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import software.amazon.awssdk.eventstreamrpc.model.EventStreamJsonMessage;

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/Version.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import java.util.Objects;
@@ -62,7 +67,7 @@ public String toString() {
6267
/**
6368
* Returns a new Version class from the given version string.
6469
* Will throw an exception if it cannot convert.
65-
*
70+
*
6671
* @param versionString The version string to convert
6772
* @return The Version class created from the string
6873
*/

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/model/AccessDeniedException.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc.model;
27

38
/**
@@ -27,7 +32,7 @@ public AccessDeniedException(String serviceName, String message) {
2732
* or the principal/authN that was rejected
2833
*
2934
* Do not overexpose reason or logic for AccessDenied. Prefer internal logging
30-
*
35+
*
3136
* @param serviceName The name of the service that caused the exception
3237
*/
3338
public AccessDeniedException(String serviceName) {

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/model/EventStreamError.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc.model;
27

38
import com.google.gson.JsonSyntaxException;

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/model/EventStreamJsonMessage.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc.model;
27

38
import com.google.gson.Gson;

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/model/EventStreamOperationError.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc.model;
27

38
import com.google.gson.annotations.Expose;

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/model/InternalServerException.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc.model;
27

38
/**

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/model/UnsupportedOperationException.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc.model;
27

38
/**

sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/model/ValidationException.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc.model;
27

38
/**

sdk/greengrass/event-stream-rpc-model/src/test/java/software/amazon/awssdk/eventstreamrpc/ObjectModelTests.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
16
package software.amazon.awssdk.eventstreamrpc;
27

38
import org.json.JSONObject;

sdk/greengrass/greengrass-client/src/event-stream-rpc-java/model/software/amazon/awssdk/aws/greengrass/AuthorizeClientDeviceActionOperationContext.java

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
import software.amazon.awssdk.eventstreamrpc.OperationModelContext;
1818
import software.amazon.awssdk.eventstreamrpc.model.EventStreamJsonMessage;
1919

20+
/**
21+
* Send a request to authorize action on some resource
22+
*/
2023
public class AuthorizeClientDeviceActionOperationContext implements OperationModelContext<AuthorizeClientDeviceActionRequest, AuthorizeClientDeviceActionResponse, EventStreamJsonMessage, EventStreamJsonMessage> {
2124
@Override
2225
public EventStreamRPCServiceModel getServiceModel() {

sdk/greengrass/greengrass-client/src/event-stream-rpc-java/model/software/amazon/awssdk/aws/greengrass/CancelLocalDeploymentOperationContext.java

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
import software.amazon.awssdk.eventstreamrpc.OperationModelContext;
1818
import software.amazon.awssdk.eventstreamrpc.model.EventStreamJsonMessage;
1919

20+
/**
21+
* Cancel a local deployment on the device.
22+
*/
2023
public class CancelLocalDeploymentOperationContext implements OperationModelContext<CancelLocalDeploymentRequest, CancelLocalDeploymentResponse, EventStreamJsonMessage, EventStreamJsonMessage> {
2124
@Override
2225
public EventStreamRPCServiceModel getServiceModel() {

sdk/greengrass/greengrass-client/src/event-stream-rpc-java/model/software/amazon/awssdk/aws/greengrass/CreateDebugPasswordOperationContext.java

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
import software.amazon.awssdk.eventstreamrpc.OperationModelContext;
1818
import software.amazon.awssdk.eventstreamrpc.model.EventStreamJsonMessage;
1919

20+
/**
21+
* Generate a password for the LocalDebugConsole component
22+
*/
2023
public class CreateDebugPasswordOperationContext implements OperationModelContext<CreateDebugPasswordRequest, CreateDebugPasswordResponse, EventStreamJsonMessage, EventStreamJsonMessage> {
2124
@Override
2225
public EventStreamRPCServiceModel getServiceModel() {

0 commit comments

Comments
 (0)