Skip to content

Commit 02a2c6c

Browse files
bretambroseBret Ambrose
andauthored
Update model and client for GG 2.11 (#436)
Co-authored-by: Bret Ambrose <[email protected]>
1 parent c02d365 commit 02a2c6c

14 files changed

+799
-3
lines changed
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*
5+
* This file is generated.
6+
*/
7+
8+
package software.amazon.awssdk.aws.greengrass;
9+
10+
import java.lang.Override;
11+
import java.lang.Void;
12+
import java.util.concurrent.CompletableFuture;
13+
import software.amazon.awssdk.aws.greengrass.model.CancelLocalDeploymentResponse;
14+
import software.amazon.awssdk.eventstreamrpc.OperationResponse;
15+
import software.amazon.awssdk.eventstreamrpc.StreamResponse;
16+
import software.amazon.awssdk.eventstreamrpc.model.EventStreamJsonMessage;
17+
18+
public final class CancelLocalDeploymentResponseHandler implements StreamResponse<CancelLocalDeploymentResponse, EventStreamJsonMessage> {
19+
private final OperationResponse<CancelLocalDeploymentResponse, EventStreamJsonMessage> operationResponse;
20+
21+
public CancelLocalDeploymentResponseHandler(
22+
final OperationResponse<CancelLocalDeploymentResponse, EventStreamJsonMessage> operationResponse) {
23+
this.operationResponse = operationResponse;
24+
}
25+
26+
@Override
27+
public CompletableFuture<Void> getRequestFlushFuture() {
28+
return operationResponse.getRequestFlushFuture();
29+
}
30+
31+
@Override
32+
public CompletableFuture<CancelLocalDeploymentResponse> getResponse() {
33+
return operationResponse.getResponse();
34+
}
35+
36+
@Override
37+
public CompletableFuture<Void> sendStreamEvent(final EventStreamJsonMessage event) {
38+
return operationResponse.sendStreamEvent(event);
39+
}
40+
41+
@Override
42+
public CompletableFuture<Void> closeStream() {
43+
return operationResponse.closeStream();
44+
}
45+
46+
@Override
47+
public boolean isClosed() {
48+
return operationResponse.isClosed();
49+
}
50+
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import java.util.Optional;
1111
import software.amazon.awssdk.aws.greengrass.model.AuthorizeClientDeviceActionRequest;
12+
import software.amazon.awssdk.aws.greengrass.model.CancelLocalDeploymentRequest;
1213
import software.amazon.awssdk.aws.greengrass.model.CertificateUpdateEvent;
1314
import software.amazon.awssdk.aws.greengrass.model.ComponentUpdatePolicyEvents;
1415
import software.amazon.awssdk.aws.greengrass.model.ConfigurationUpdateEvents;
@@ -55,6 +56,10 @@ AuthorizeClientDeviceActionResponseHandler authorizeClientDeviceAction(
5556
final AuthorizeClientDeviceActionRequest request,
5657
final Optional<StreamResponseHandler<EventStreamJsonMessage>> streamResponseHandler);
5758

59+
CancelLocalDeploymentResponseHandler cancelLocalDeployment(
60+
final CancelLocalDeploymentRequest request,
61+
final Optional<StreamResponseHandler<EventStreamJsonMessage>> streamResponseHandler);
62+
5863
CreateDebugPasswordResponseHandler createDebugPassword(final CreateDebugPasswordRequest request,
5964
final Optional<StreamResponseHandler<EventStreamJsonMessage>> streamResponseHandler);
6065

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.lang.Override;
1111
import java.util.Optional;
1212
import software.amazon.awssdk.aws.greengrass.model.AuthorizeClientDeviceActionRequest;
13+
import software.amazon.awssdk.aws.greengrass.model.CancelLocalDeploymentRequest;
1314
import software.amazon.awssdk.aws.greengrass.model.CertificateUpdateEvent;
1415
import software.amazon.awssdk.aws.greengrass.model.ComponentUpdatePolicyEvents;
1516
import software.amazon.awssdk.aws.greengrass.model.ConfigurationUpdateEvents;
@@ -66,6 +67,14 @@ public AuthorizeClientDeviceActionResponseHandler authorizeClientDeviceAction(
6667
return new AuthorizeClientDeviceActionResponseHandler(doOperationInvoke(operationContext, request, streamResponseHandler));
6768
}
6869

70+
@Override
71+
public CancelLocalDeploymentResponseHandler cancelLocalDeployment(
72+
final CancelLocalDeploymentRequest request,
73+
final Optional<StreamResponseHandler<EventStreamJsonMessage>> streamResponseHandler) {
74+
final CancelLocalDeploymentOperationContext operationContext = GreengrassCoreIPCServiceModel.getCancelLocalDeploymentModelContext();
75+
return new CancelLocalDeploymentResponseHandler(doOperationInvoke(operationContext, request, streamResponseHandler));
76+
}
77+
6978
@Override
7079
public CreateDebugPasswordResponseHandler createDebugPassword(
7180
final CreateDebugPasswordRequest request,

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import java.util.function.Function;
2929
import software.amazon.awssdk.aws.greengrass.model.AuthorizeClientDeviceActionRequest;
3030
import software.amazon.awssdk.aws.greengrass.model.AuthorizeClientDeviceActionResponse;
31+
import software.amazon.awssdk.aws.greengrass.model.CancelLocalDeploymentRequest;
32+
import software.amazon.awssdk.aws.greengrass.model.CancelLocalDeploymentResponse;
3133
import software.amazon.awssdk.aws.greengrass.model.CertificateUpdateEvent;
3234
import software.amazon.awssdk.aws.greengrass.model.ComponentUpdatePolicyEvents;
3335
import software.amazon.awssdk.aws.greengrass.model.ConfigurationUpdateEvents;
@@ -167,6 +169,31 @@ public CompletableFuture<AuthorizeClientDeviceActionResponse> authorizeClientDev
167169
return client.authorizeClientDeviceAction(request, Optional.empty()).getResponse();
168170
}
169171

172+
/**
173+
* Perform the cancelLocalDeployment operation synchronously.
174+
*
175+
* @throws InterruptedException if thread is interrupted while waiting for the response
176+
* @return the response
177+
*
178+
* @param request request object
179+
*/
180+
public CancelLocalDeploymentResponse cancelLocalDeployment(
181+
final CancelLocalDeploymentRequest request) throws InterruptedException {
182+
return getResponse(this.cancelLocalDeploymentAsync(request));
183+
}
184+
185+
/**
186+
* Perform the cancelLocalDeployment operation asynchronously.
187+
*
188+
* @return a future which resolves to the response
189+
*
190+
* @param request request object
191+
*/
192+
public CompletableFuture<CancelLocalDeploymentResponse> cancelLocalDeploymentAsync(
193+
final CancelLocalDeploymentRequest request) {
194+
return client.cancelLocalDeployment(request, Optional.empty()).getResponse();
195+
}
196+
170197
/**
171198
* Perform the createDebugPassword operation synchronously.
172199
*
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*
5+
* This file is generated.
6+
*/
7+
8+
package software.amazon.awssdk.aws.greengrass;
9+
10+
import java.lang.Class;
11+
import java.lang.Override;
12+
import java.lang.String;
13+
import java.util.Optional;
14+
import software.amazon.awssdk.aws.greengrass.model.CancelLocalDeploymentRequest;
15+
import software.amazon.awssdk.aws.greengrass.model.CancelLocalDeploymentResponse;
16+
import software.amazon.awssdk.eventstreamrpc.EventStreamRPCServiceModel;
17+
import software.amazon.awssdk.eventstreamrpc.OperationModelContext;
18+
import software.amazon.awssdk.eventstreamrpc.model.EventStreamJsonMessage;
19+
20+
public class CancelLocalDeploymentOperationContext implements OperationModelContext<CancelLocalDeploymentRequest, CancelLocalDeploymentResponse, EventStreamJsonMessage, EventStreamJsonMessage> {
21+
@Override
22+
public EventStreamRPCServiceModel getServiceModel() {
23+
return GreengrassCoreIPCServiceModel.getInstance();
24+
}
25+
26+
@Override
27+
public String getOperationName() {
28+
return GreengrassCoreIPCServiceModel.CANCEL_LOCAL_DEPLOYMENT;
29+
}
30+
31+
@Override
32+
public Class<CancelLocalDeploymentRequest> getRequestTypeClass() {
33+
return CancelLocalDeploymentRequest.class;
34+
}
35+
36+
@Override
37+
public Class<CancelLocalDeploymentResponse> getResponseTypeClass() {
38+
return CancelLocalDeploymentResponse.class;
39+
}
40+
41+
@Override
42+
public String getRequestApplicationModelType() {
43+
return CancelLocalDeploymentRequest.APPLICATION_MODEL_TYPE;
44+
}
45+
46+
@Override
47+
public String getResponseApplicationModelType() {
48+
return CancelLocalDeploymentResponse.APPLICATION_MODEL_TYPE;
49+
}
50+
51+
@Override
52+
public Optional<Class<EventStreamJsonMessage>> getStreamingRequestTypeClass() {
53+
return Optional.empty();
54+
}
55+
56+
@Override
57+
public Optional<Class<EventStreamJsonMessage>> getStreamingResponseTypeClass() {
58+
return Optional.empty();
59+
}
60+
61+
public Optional<String> getStreamingRequestApplicationModelType() {
62+
return Optional.empty();
63+
}
64+
65+
@Override
66+
public Optional<String> getStreamingResponseApplicationModelType() {
67+
return Optional.empty();
68+
}
69+
}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import software.amazon.awssdk.aws.greengrass.model.AuthorizeClientDeviceActionRequest;
2020
import software.amazon.awssdk.aws.greengrass.model.AuthorizeClientDeviceActionResponse;
2121
import software.amazon.awssdk.aws.greengrass.model.BinaryMessage;
22+
import software.amazon.awssdk.aws.greengrass.model.CancelLocalDeploymentRequest;
23+
import software.amazon.awssdk.aws.greengrass.model.CancelLocalDeploymentResponse;
2224
import software.amazon.awssdk.aws.greengrass.model.CertificateOptions;
2325
import software.amazon.awssdk.aws.greengrass.model.CertificateType;
2426
import software.amazon.awssdk.aws.greengrass.model.CertificateUpdate;
@@ -42,7 +44,10 @@
4244
import software.amazon.awssdk.aws.greengrass.model.DeleteThingShadowRequest;
4345
import software.amazon.awssdk.aws.greengrass.model.DeleteThingShadowResponse;
4446
import software.amazon.awssdk.aws.greengrass.model.DeploymentStatus;
47+
import software.amazon.awssdk.aws.greengrass.model.DeploymentStatusDetails;
48+
import software.amazon.awssdk.aws.greengrass.model.DetailedDeploymentStatus;
4549
import software.amazon.awssdk.aws.greengrass.model.FailedUpdateConditionCheckError;
50+
import software.amazon.awssdk.aws.greengrass.model.FailureHandlingPolicy;
4651
import software.amazon.awssdk.aws.greengrass.model.GetClientDeviceAuthTokenRequest;
4752
import software.amazon.awssdk.aws.greengrass.model.GetClientDeviceAuthTokenResponse;
4853
import software.amazon.awssdk.aws.greengrass.model.GetComponentDetailsRequest;
@@ -153,6 +158,10 @@ public class GreengrassCoreIPCServiceModel extends EventStreamRPCServiceModel {
153158

154159
private static final AuthorizeClientDeviceActionOperationContext _AUTHORIZE_CLIENT_DEVICE_ACTION_OPERATION_CONTEXT = new AuthorizeClientDeviceActionOperationContext();
155160

161+
public static final String CANCEL_LOCAL_DEPLOYMENT = SERVICE_NAMESPACE + "#" + "CancelLocalDeployment";
162+
163+
private static final CancelLocalDeploymentOperationContext _CANCEL_LOCAL_DEPLOYMENT_OPERATION_CONTEXT = new CancelLocalDeploymentOperationContext();
164+
156165
public static final String CREATE_DEBUG_PASSWORD = SERVICE_NAMESPACE + "#" + "CreateDebugPassword";
157166

158167
private static final CreateDebugPasswordOperationContext _CREATE_DEBUG_PASSWORD_OPERATION_CONTEXT = new CreateDebugPasswordOperationContext();
@@ -284,6 +293,8 @@ public class GreengrassCoreIPCServiceModel extends EventStreamRPCServiceModel {
284293
static {
285294
SERVICE_OPERATION_MODEL_MAP.put(AUTHORIZE_CLIENT_DEVICE_ACTION, _AUTHORIZE_CLIENT_DEVICE_ACTION_OPERATION_CONTEXT);
286295
SERVICE_OPERATION_SET.add(AUTHORIZE_CLIENT_DEVICE_ACTION);
296+
SERVICE_OPERATION_MODEL_MAP.put(CANCEL_LOCAL_DEPLOYMENT, _CANCEL_LOCAL_DEPLOYMENT_OPERATION_CONTEXT);
297+
SERVICE_OPERATION_SET.add(CANCEL_LOCAL_DEPLOYMENT);
287298
SERVICE_OPERATION_MODEL_MAP.put(CREATE_DEBUG_PASSWORD, _CREATE_DEBUG_PASSWORD_OPERATION_CONTEXT);
288299
SERVICE_OPERATION_SET.add(CREATE_DEBUG_PASSWORD);
289300
SERVICE_OPERATION_MODEL_MAP.put(CREATE_LOCAL_DEPLOYMENT, _CREATE_LOCAL_DEPLOYMENT_OPERATION_CONTEXT);
@@ -351,6 +362,8 @@ public class GreengrassCoreIPCServiceModel extends EventStreamRPCServiceModel {
351362
SERVICE_OBJECT_MODEL_MAP.put(AuthorizeClientDeviceActionRequest.APPLICATION_MODEL_TYPE, AuthorizeClientDeviceActionRequest.class);
352363
SERVICE_OBJECT_MODEL_MAP.put(AuthorizeClientDeviceActionResponse.APPLICATION_MODEL_TYPE, AuthorizeClientDeviceActionResponse.class);
353364
SERVICE_OBJECT_MODEL_MAP.put(BinaryMessage.APPLICATION_MODEL_TYPE, BinaryMessage.class);
365+
SERVICE_OBJECT_MODEL_MAP.put(CancelLocalDeploymentRequest.APPLICATION_MODEL_TYPE, CancelLocalDeploymentRequest.class);
366+
SERVICE_OBJECT_MODEL_MAP.put(CancelLocalDeploymentResponse.APPLICATION_MODEL_TYPE, CancelLocalDeploymentResponse.class);
354367
SERVICE_OBJECT_MODEL_MAP.put(CertificateOptions.APPLICATION_MODEL_TYPE, CertificateOptions.class);
355368
SERVICE_OBJECT_MODEL_MAP.put(CertificateType.APPLICATION_MODEL_TYPE, CertificateType.class);
356369
SERVICE_OBJECT_MODEL_MAP.put(CertificateUpdate.APPLICATION_MODEL_TYPE, CertificateUpdate.class);
@@ -374,7 +387,10 @@ public class GreengrassCoreIPCServiceModel extends EventStreamRPCServiceModel {
374387
SERVICE_OBJECT_MODEL_MAP.put(DeleteThingShadowRequest.APPLICATION_MODEL_TYPE, DeleteThingShadowRequest.class);
375388
SERVICE_OBJECT_MODEL_MAP.put(DeleteThingShadowResponse.APPLICATION_MODEL_TYPE, DeleteThingShadowResponse.class);
376389
SERVICE_OBJECT_MODEL_MAP.put(DeploymentStatus.APPLICATION_MODEL_TYPE, DeploymentStatus.class);
390+
SERVICE_OBJECT_MODEL_MAP.put(DeploymentStatusDetails.APPLICATION_MODEL_TYPE, DeploymentStatusDetails.class);
391+
SERVICE_OBJECT_MODEL_MAP.put(DetailedDeploymentStatus.APPLICATION_MODEL_TYPE, DetailedDeploymentStatus.class);
377392
SERVICE_OBJECT_MODEL_MAP.put(FailedUpdateConditionCheckError.APPLICATION_MODEL_TYPE, FailedUpdateConditionCheckError.class);
393+
SERVICE_OBJECT_MODEL_MAP.put(FailureHandlingPolicy.APPLICATION_MODEL_TYPE, FailureHandlingPolicy.class);
378394
SERVICE_OBJECT_MODEL_MAP.put(GetClientDeviceAuthTokenRequest.APPLICATION_MODEL_TYPE, GetClientDeviceAuthTokenRequest.class);
379395
SERVICE_OBJECT_MODEL_MAP.put(GetClientDeviceAuthTokenResponse.APPLICATION_MODEL_TYPE, GetClientDeviceAuthTokenResponse.class);
380396
SERVICE_OBJECT_MODEL_MAP.put(GetComponentDetailsRequest.APPLICATION_MODEL_TYPE, GetComponentDetailsRequest.class);
@@ -483,6 +499,10 @@ public static AuthorizeClientDeviceActionOperationContext getAuthorizeClientDevi
483499
return _AUTHORIZE_CLIENT_DEVICE_ACTION_OPERATION_CONTEXT;
484500
}
485501

502+
public static CancelLocalDeploymentOperationContext getCancelLocalDeploymentModelContext() {
503+
return _CANCEL_LOCAL_DEPLOYMENT_OPERATION_CONTEXT;
504+
}
505+
486506
public static CreateDebugPasswordOperationContext getCreateDebugPasswordModelContext() {
487507
return _CREATE_DEBUG_PASSWORD_OPERATION_CONTEXT;
488508
}
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*
5+
* This file is generated.
6+
*/
7+
8+
package software.amazon.awssdk.aws.greengrass.model;
9+
10+
import com.google.gson.annotations.Expose;
11+
import java.lang.Object;
12+
import java.lang.Override;
13+
import java.lang.String;
14+
import java.util.Objects;
15+
import java.util.Optional;
16+
import software.amazon.awssdk.eventstreamrpc.model.EventStreamJsonMessage;
17+
18+
public class CancelLocalDeploymentRequest implements EventStreamJsonMessage {
19+
public static final String APPLICATION_MODEL_TYPE = "aws.greengrass#CancelLocalDeploymentRequest";
20+
21+
public static final CancelLocalDeploymentRequest VOID;
22+
23+
static {
24+
VOID = new CancelLocalDeploymentRequest() {
25+
@Override
26+
public boolean isVoid() {
27+
return true;
28+
}
29+
};
30+
}
31+
32+
@Expose(
33+
serialize = true,
34+
deserialize = true
35+
)
36+
private Optional<String> deploymentId;
37+
38+
public CancelLocalDeploymentRequest() {
39+
this.deploymentId = Optional.empty();
40+
}
41+
42+
/**
43+
* (Optional) The ID of the local deployment to cancel.
44+
*/
45+
public String getDeploymentId() {
46+
if (deploymentId.isPresent()) {
47+
return deploymentId.get();
48+
}
49+
return null;
50+
}
51+
52+
/**
53+
* (Optional) The ID of the local deployment to cancel.
54+
*/
55+
public void setDeploymentId(final String deploymentId) {
56+
this.deploymentId = Optional.ofNullable(deploymentId);
57+
}
58+
59+
/**
60+
* (Optional) The ID of the local deployment to cancel.
61+
*/
62+
public CancelLocalDeploymentRequest withDeploymentId(final String deploymentId) {
63+
setDeploymentId(deploymentId);
64+
return this;
65+
}
66+
67+
@Override
68+
public String getApplicationModelType() {
69+
return APPLICATION_MODEL_TYPE;
70+
}
71+
72+
@Override
73+
public boolean equals(Object rhs) {
74+
if (rhs == null) return false;
75+
if (!(rhs instanceof CancelLocalDeploymentRequest)) return false;
76+
if (this == rhs) return true;
77+
final CancelLocalDeploymentRequest other = (CancelLocalDeploymentRequest)rhs;
78+
boolean isEquals = true;
79+
isEquals = isEquals && this.deploymentId.equals(other.deploymentId);
80+
return isEquals;
81+
}
82+
83+
@Override
84+
public int hashCode() {
85+
return Objects.hash(deploymentId);
86+
}
87+
}

0 commit comments

Comments
 (0)