Skip to content

Commit 2088e31

Browse files
timmattisontimmattison
committed
More cleanup
1 parent 2679845 commit 2088e31

Some content is hidden

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

52 files changed

+197
-241
lines changed

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ group = "local"
3434
version = "1.0-SNAPSHOT"
3535

3636
// Specify all of our dependency versions
37-
val awsCdkVersion = "1.131.0"
37+
val awsCdkVersion = "1.134.0"
3838
val awsSdkVersion = "2.17.91"
3939
val vavrVersion = "0.10.4"
4040
val commonsLangVersion = "3.12.0"
4141
val commonsIoVersion = "2.11.0"
4242
val ztZipVersion = "1.14"
43-
val resultsIteratorForAwsJavaSdkVersion = "29.0.22"
43+
val resultsIteratorForAwsJavaSdkVersion = "29.0.23"
4444
val junitVersion = "4.13.2"
4545
val autoServiceVersion = "1.0.1"
4646
val javaPoetVersion = "1.13.0"

‎src/main/java/com/aws/samples/cdk/constructs/autowired/cloudformation/CustomResourceFunction.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void handleRequest(CustomResourceRequest customResourceRequest, Context c
4747
}
4848

4949
private Try<CustomResourceResponse> createFailureResponse(Throwable throwable, CustomResourceRequest customResourceRequest, Context context) {
50-
return Try.of(() -> ImmutableCustomResourceResponse.builder()
50+
return Try.of(() -> CustomResourceResponse.builder()
5151
.customResourceRequest(customResourceRequest)
5252
.context(context)
5353
.status(CustomResourceStatus.FAILED)
@@ -74,7 +74,7 @@ private Try<CustomResourceResponse> createFailureResponse(Throwable throwable, C
7474
* @return
7575
*/
7676
protected CustomResourceResponse simpleDeleteSuccess(CustomResourceRequest customResourceRequest, Context context, Map<String, Object> data) {
77-
ImmutableCustomResourceResponse.Builder builder = ImmutableCustomResourceResponse.builder()
77+
CustomResourceResponse.Builder builder = CustomResourceResponse.builder()
7878
.customResourceRequest(customResourceRequest)
7979
.context(context)
8080
.status(CustomResourceStatus.SUCCESS)
@@ -100,7 +100,7 @@ protected CustomResourceResponse simpleDeleteSuccess(CustomResourceRequest custo
100100
* @return
101101
*/
102102
protected CustomResourceResponse simpleCreateOrUpdateSuccess(CustomResourceRequest customResourceRequest, Context context, String newPhysicalResourceId, Map<String, Object> data) {
103-
ImmutableCustomResourceResponse.Builder builder = ImmutableCustomResourceResponse.builder()
103+
CustomResourceResponse.Builder builder = CustomResourceResponse.builder()
104104
.customResourceRequest(customResourceRequest)
105105
.context(context)
106106
.status(CustomResourceStatus.SUCCESS)

‎src/main/java/com/aws/samples/cdk/constructs/autowired/cloudformation/CustomResourceRequest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.aws.samples.cdk.constructs.autowired.cloudformation;
22

3-
import com.aws.samples.cdk.constructs.iam.permissions.sqs.actions.GetQueueUrl;
43
import com.google.gson.annotations.SerializedName;
54
import org.immutables.gson.Gson;
65
import org.immutables.value.Value;
@@ -11,6 +10,10 @@
1110
@Gson.TypeAdapters
1211
@Value.Immutable
1312
public abstract class CustomResourceRequest {
13+
public static Builder builder() {
14+
return new Builder();
15+
}
16+
1417
@SerializedName("ResourceProperties")
1518
public abstract Map<String, Object> getResourceProperties();
1619

@@ -37,8 +40,4 @@ public abstract class CustomResourceRequest {
3740

3841
public static class Builder extends ImmutableCustomResourceRequest.Builder {
3942
}
40-
41-
public static Builder builder() {
42-
return new Builder();
43-
}
4443
}

‎src/main/java/com/aws/samples/cdk/constructs/autowired/cloudformation/CustomResourceResponse.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.aws.samples.cdk.constructs.autowired.cloudformation;
22

33
import com.amazonaws.services.lambda.runtime.Context;
4-
import com.aws.samples.cdk.constructs.iam.permissions.sqs.actions.GetQueueUrl;
54
import com.fasterxml.jackson.annotation.JsonIgnore;
65
import com.google.gson.annotations.SerializedName;
76
import org.immutables.gson.Gson;
@@ -13,6 +12,10 @@
1312
@Gson.TypeAdapters
1413
@Value.Immutable
1514
public abstract class CustomResourceResponse {
15+
public static Builder builder() {
16+
return new Builder();
17+
}
18+
1619
@Value.Default
1720
@SerializedName("StackId")
1821
public String getStackId() {
@@ -74,8 +77,4 @@ private String getLogStreamNameAsDefault() {
7477

7578
public static class Builder extends ImmutableCustomResourceResponse.Builder {
7679
}
77-
78-
public static Builder builder() {
79-
return new Builder();
80-
}
8180
}

‎src/main/java/com/aws/samples/cdk/constructs/iam/actions/GetAnyRole.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.aws.samples.cdk.constructs.iam.permissions.IamPermission;
55
import com.aws.samples.cdk.constructs.iam.permissions.IamResource;
66
import com.aws.samples.cdk.constructs.iam.permissions.SharedPermissions;
7-
import com.aws.samples.cdk.constructs.iam.permissions.sqs.actions.GetQueueUrl;
87
import com.aws.samples.cdk.constructs.iam.resources.IamAllResources;
98
import io.vavr.Tuple;
109
import io.vavr.Tuple2;
@@ -14,6 +13,10 @@
1413
@Gson.TypeAdapters
1514
@Value.Immutable
1615
public class GetAnyRole implements IamPermission {
16+
public static Builder builder() {
17+
return new Builder();
18+
}
19+
1720
@Override
1821
public Tuple2<IamAction, IamResource> getActionAndResource() {
1922
IamAction iamAction = new IamAction() {
@@ -33,8 +36,4 @@ public IamResource getIamResource() {
3336

3437
public static class Builder extends ImmutableGetAnyRole.Builder {
3538
}
36-
37-
public static Builder builder() {
38-
return new Builder();
39-
}
4039
}

‎src/main/java/com/aws/samples/cdk/constructs/iam/permissions/iot/IotActions.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66
import com.aws.samples.cdk.constructs.iam.permissions.iot.dataplane.resources.TopicFilter;
77

88
public class IotActions {
9-
public static DescribeEndpoint describeEndpoint = ImmutableDescribeEndpoint.builder().build();
9+
public static DescribeEndpoint describeEndpoint = DescribeEndpoint.builder().build();
1010

11-
public static SearchIndex searchIndex = ImmutableSearchIndex.builder().build();
11+
public static SearchIndex searchIndex = SearchIndex.builder().build();
1212

1313
public static Publish publish(Topic topic) {
14-
return ImmutablePublish.builder().topic(topic).build();
14+
return Publish.builder().topic(topic).build();
1515
}
1616

1717
public static Receive receive(Topic topic) {
18-
return ImmutableReceive.builder().topic(topic).build();
18+
return Receive.builder().topic(topic).build();
1919
}
2020

2121
public static Subscribe subscribe(TopicFilter topicFilter) {
22-
return ImmutableSubscribe.builder().topicFilter(topicFilter).build();
22+
return Subscribe.builder().topicFilter(topicFilter).build();
2323
}
2424

2525
public static Connect connect(ClientId clientId) {
26-
return ImmutableConnect.builder().clientId(clientId).build();
26+
return Connect.builder().clientId(clientId).build();
2727
}
2828
}

‎src/main/java/com/aws/samples/cdk/constructs/iam/permissions/iot/IotResources.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
package com.aws.samples.cdk.constructs.iam.permissions.iot;
22

3-
import com.aws.samples.cdk.constructs.iam.permissions.iot.dataplane.resources.*;
3+
import com.aws.samples.cdk.constructs.iam.permissions.iot.dataplane.resources.ClientId;
4+
import com.aws.samples.cdk.constructs.iam.permissions.iot.dataplane.resources.Topic;
5+
import com.aws.samples.cdk.constructs.iam.permissions.iot.dataplane.resources.TopicFilter;
46

57
public class IotResources {
68
public static Topic topic(String topic) {
7-
return ImmutableTopic.builder().topic(topic).build();
9+
return Topic.builder().topic(topic).build();
810
}
911

1012
public static TopicFilter topicFilter(String topicFilter) {
11-
return ImmutableTopicFilter.builder().topicFilter(topicFilter).build();
13+
return TopicFilter.builder().topicFilter(topicFilter).build();
1214
}
1315

1416
public static ClientId clientId(String clientId) {
15-
return ImmutableClientId.builder().clientId(clientId).build();
17+
return ClientId.builder().clientId(clientId).build();
1618
}
1719
}

‎src/main/java/com/aws/samples/cdk/constructs/iam/permissions/iot/controlplane/actions/CreateCertificateFromCsr.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.aws.samples.cdk.constructs.iam.permissions.IamResource;
66
import com.aws.samples.cdk.constructs.iam.permissions.SharedPermissions;
77
import com.aws.samples.cdk.constructs.iam.permissions.iot.dataplane.resources.IotAllResources;
8-
import com.aws.samples.cdk.constructs.iam.permissions.sqs.actions.GetQueueUrl;
98
import io.vavr.Tuple;
109
import io.vavr.Tuple2;
1110
import org.immutables.gson.Gson;
@@ -14,6 +13,10 @@
1413
@Gson.TypeAdapters
1514
@Value.Immutable
1615
public abstract class CreateCertificateFromCsr implements IamPermission {
16+
public static Builder builder() {
17+
return new Builder();
18+
}
19+
1720
@Override
1821
public Tuple2<IamAction, IamResource> getActionAndResource() {
1922
IamAction iamAction = new IamAction() {
@@ -33,8 +36,4 @@ public IamResource getIamResource() {
3336

3437
public static class Builder extends ImmutableCreateCertificateFromCsr.Builder {
3538
}
36-
37-
public static Builder builder() {
38-
return new Builder();
39-
}
4039
}

‎src/main/java/com/aws/samples/cdk/constructs/iam/permissions/iot/controlplane/actions/DeleteCertificate.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.aws.samples.cdk.constructs.iam.permissions.IamResource;
66
import com.aws.samples.cdk.constructs.iam.permissions.SharedPermissions;
77
import com.aws.samples.cdk.constructs.iam.permissions.iot.dataplane.resources.IotAllResources;
8-
import com.aws.samples.cdk.constructs.iam.permissions.sqs.actions.GetQueueUrl;
98
import io.vavr.Tuple;
109
import io.vavr.Tuple2;
1110
import org.immutables.gson.Gson;
@@ -14,6 +13,10 @@
1413
@Gson.TypeAdapters
1514
@Value.Immutable
1615
public abstract class DeleteCertificate implements IamPermission {
16+
public static Builder builder() {
17+
return new Builder();
18+
}
19+
1720
@Override
1821
public Tuple2<IamAction, IamResource> getActionAndResource() {
1922
IamAction iamAction = new IamAction() {
@@ -33,8 +36,4 @@ public IamResource getIamResource() {
3336

3437
public static class Builder extends ImmutableDeleteCertificate.Builder {
3538
}
36-
37-
public static Builder builder() {
38-
return new Builder();
39-
}
4039
}

‎src/main/java/com/aws/samples/cdk/constructs/iam/permissions/iot/controlplane/actions/RegisterCertificateWithoutCa.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.aws.samples.cdk.constructs.iam.permissions.IamResource;
66
import com.aws.samples.cdk.constructs.iam.permissions.SharedPermissions;
77
import com.aws.samples.cdk.constructs.iam.permissions.iot.dataplane.resources.IotAllResources;
8-
import com.aws.samples.cdk.constructs.iam.permissions.sqs.actions.GetQueueUrl;
98
import io.vavr.Tuple;
109
import io.vavr.Tuple2;
1110
import org.immutables.gson.Gson;
@@ -14,6 +13,10 @@
1413
@Gson.TypeAdapters
1514
@Value.Immutable
1615
public abstract class RegisterCertificateWithoutCa implements IamPermission {
16+
public static Builder builder() {
17+
return new Builder();
18+
}
19+
1720
@Override
1821
public Tuple2<IamAction, IamResource> getActionAndResource() {
1922
IamAction iamAction = new IamAction() {
@@ -33,8 +36,4 @@ public IamResource getIamResource() {
3336

3437
public static class Builder extends ImmutableRegisterCertificateWithoutCa.Builder {
3538
}
36-
37-
public static Builder builder() {
38-
return new Builder();
39-
}
4039
}

0 commit comments

Comments
 (0)