Skip to content

Commit 5f17f9c

Browse files
committed
Fix build and add end to end tests
1 parent dee425c commit 5f17f9c

File tree

5 files changed

+45
-19
lines changed

5 files changed

+45
-19
lines changed

test/v2-migration-tests/src/test/resources/maven/after/src/main/java/foo/bar/Application.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515

1616
package foo.bar;
1717

18-
import software.amazon.awssdk.core.exception.SdkException;
1918
import software.amazon.awssdk.services.s3.S3Client;
2019
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
20+
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
21+
import software.amazon.awssdk.services.s3.model.PutObjectResponse;
2122
import software.amazon.awssdk.services.s3.model.S3Object;
2223
import software.amazon.awssdk.services.sqs.SqsClient;
2324
import software.amazon.awssdk.services.sqs.model.QueueDoesNotExistException;
@@ -32,6 +33,8 @@
3233
import java.nio.file.StandardCopyOption;
3334
import software.amazon.awssdk.awscore.exception.AwsServiceException;
3435
import software.amazon.awssdk.core.ResponseInputStream;
36+
import software.amazon.awssdk.core.exception.SdkException;
37+
import software.amazon.awssdk.core.sync.RequestBody;
3538
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
3639

3740
public class Application {
@@ -90,4 +93,11 @@ private static Path downloadFile(S3Client s3, String bucket, String key, Path ds
9093

9194
return dst;
9295
}
96+
97+
private static PutObjectResponse uploadFile(S3Client s3, String bucket, String key, Path source) throws IOException {
98+
PutObjectResponse result = s3.putObject(PutObjectRequest.builder()
99+
.build(), RequestBody.fromFile(source.toFile()));
100+
101+
return result;
102+
}
93103
}

test/v2-migration-tests/src/test/resources/maven/after/src/main/java/foo/bar/Enums.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public static void main(String... args) {
2929
System.out.println(qan);
3030
System.out.println(qan2);
3131

32-
ReceiveMessageRequest v1Request = ReceiveMessageRequest.builder().build();
32+
ReceiveMessageRequest v1Request = ReceiveMessageRequest.builder()
33+
.build();
3334
List<String> attributes = v1Request.attributeNamesAsStrings();
3435
System.out.println(attributes);
3536

test/v2-migration-tests/src/test/resources/maven/before/src/main/java/foo/bar/Application.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import com.amazonaws.AmazonServiceException;
2020
import com.amazonaws.services.s3.AmazonS3;
2121
import com.amazonaws.services.s3.model.GetObjectRequest;
22+
import com.amazonaws.services.s3.model.PutObjectRequest;
23+
import com.amazonaws.services.s3.model.PutObjectResult;
2224
import com.amazonaws.services.s3.model.S3Object;
2325
import com.amazonaws.services.sqs.AmazonSQS;
2426
import com.amazonaws.services.sqs.model.AmazonSQSException;
@@ -86,4 +88,10 @@ private static Path downloadFile(AmazonS3 s3, String bucket, String key, Path ds
8688

8789
return dst;
8890
}
91+
92+
private static PutObjectResult uploadFile(AmazonS3 s3, String bucket, String key, Path source) throws IOException {
93+
PutObjectResult result = s3.putObject(bucket, key, source.toFile());
94+
95+
return result;
96+
}
8997
}

v2-migration/src/main/java/software/amazon/awssdk/v2migration/EnumCasingToV2.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,12 @@ public J.Identifier visitIdentifier(J.Identifier identifier, ExecutionContext ct
7676
J.Identifier id = super.visitIdentifier(identifier, ctx);
7777

7878
if (ENUMS.contains(id.getSimpleName())) {
79-
return id.withFieldType(id.getFieldType().withName(id.getSimpleName()));
79+
JavaType.Variable fieldType = id.getFieldType();
80+
if (fieldType == null) {
81+
return id;
82+
}
83+
JavaType.Variable variable = fieldType.withName(id.getSimpleName());
84+
return id.withFieldType(variable);
8085
}
8186

8287
return id;

v2-migration/src/test/java/software/amazon/awssdk/v2migration/EnumGettersToV2Test.java

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,15 @@ void shouldChangeSingleItemEnumGetter() {
6262
" String routeType = phoneNumberInformation.getRouteType();\n" +
6363
" }\n" +
6464
"}\n",
65-
"import software.amazon.awssdk.services.sns.model.PhoneNumberInformation;\n" +
66-
"\n" +
67-
"class Test {\n" +
68-
" static void method() {\n" +
69-
" PhoneNumberInformation phoneNumberInformation = PhoneNumberInformation.builder().build();\n" +
70-
" String routeType = phoneNumberInformation.routeTypeAsString();\n" +
71-
" }\n" +
72-
"}\n"
65+
"import software.amazon.awssdk.services.sns.model.PhoneNumberInformation;\n"
66+
+ "\n"
67+
+ "class Test {\n"
68+
+ " static void method() {\n"
69+
+ " PhoneNumberInformation phoneNumberInformation = PhoneNumberInformation.builder()\n"
70+
+ " .build();\n"
71+
+ " String routeType = phoneNumberInformation.routeTypeAsString();\n"
72+
+ " }\n"
73+
+ "}"
7374
)
7475
);
7576
}
@@ -87,14 +88,15 @@ void shouldChangeCollectionItemEnumGetter() {
8788
" List<String> numberCapabilities = phoneNumberInformation.getNumberCapabilities();\n" +
8889
" }\n" +
8990
"}\n",
90-
"import software.amazon.awssdk.services.sns.model.PhoneNumberInformation;\n" +
91-
"\n" +
92-
"class Test {\n" +
93-
" static void method() {\n" +
94-
" PhoneNumberInformation phoneNumberInformation = PhoneNumberInformation.builder().build();\n" +
95-
" List<String> numberCapabilities = phoneNumberInformation.numberCapabilitiesAsStrings();\n" +
96-
" }\n" +
97-
"}\n"
91+
"import software.amazon.awssdk.services.sns.model.PhoneNumberInformation;\n"
92+
+ "\n"
93+
+ "class Test {\n"
94+
+ " static void method() {\n"
95+
+ " PhoneNumberInformation phoneNumberInformation = PhoneNumberInformation.builder()\n"
96+
+ " .build();\n"
97+
+ " List<String> numberCapabilities = phoneNumberInformation.numberCapabilitiesAsStrings();\n"
98+
+ " }\n"
99+
+ "}"
98100
)
99101
);
100102
}

0 commit comments

Comments
 (0)