|
17 | 17 |
|
18 | 18 | import static software.amazon.awssdk.v2migration.internal.utils.NamingConversionUtils.getV2Equivalent;
|
19 | 19 | import static software.amazon.awssdk.v2migration.internal.utils.NamingConversionUtils.getV2ModelPackageWildCardEquivalent;
|
| 20 | +import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isCustomSdk; |
20 | 21 | import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isV1ClientClass;
|
21 | 22 | import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isV1ModelClass;
|
22 | 23 |
|
23 | 24 | import java.util.ArrayList;
|
24 |
| -import java.util.Arrays; |
25 | 25 | import java.util.HashMap;
|
26 | 26 | import java.util.HashSet;
|
27 | 27 | import java.util.IdentityHashMap;
|
@@ -65,10 +65,6 @@ public class ChangeSdkType extends Recipe {
|
65 | 65 | "com\\.amazonaws\\.services\\.[a-zA-Z0-9]+\\.model\\.\\*";
|
66 | 66 | private static final String V1_SERVICE_WILD_CARD_CLASS_PATTERN = "com\\.amazonaws\\.services\\.[a-zA-Z0-9]+\\.\\*";
|
67 | 67 |
|
68 |
| - private static final Set<String> PACKAGES_TO_SKIP = new HashSet<>( |
69 |
| - Arrays.asList("com.amazonaws.services.s3.transfer", |
70 |
| - "com.amazonaws.services.dynamodbv2.datamodeling")); |
71 |
| - |
72 | 68 | @Override
|
73 | 69 | public String getDisplayName() {
|
74 | 70 | return "Change AWS SDK for Java v1 types to v2 equivalents";
|
@@ -139,17 +135,16 @@ private static boolean isWildcard(String fullName) {
|
139 | 135 |
|
140 | 136 | private static boolean isV1Class(JavaType.FullyQualified fullyQualified) {
|
141 | 137 | String fullyQualifiedName = fullyQualified.getFullyQualifiedName();
|
142 |
| - if (shouldSkip(fullyQualifiedName)) { |
143 |
| - log.info(() -> String.format("Skipping transformation for %s because it is not supported in the migration " |
144 |
| - + "tooling at the moment", fullyQualifiedName)); |
| 138 | + |
| 139 | + if (!isV1ModelClass(fullyQualified) && !isV1ClientClass(fullyQualified)) { |
145 | 140 | return false;
|
146 | 141 | }
|
147 | 142 |
|
148 |
| - return isV1ModelClass(fullyQualified) || isV1ClientClass(fullyQualified); |
149 |
| - } |
150 |
| - |
151 |
| - private static boolean shouldSkip(String fqcn) { |
152 |
| - return PACKAGES_TO_SKIP.stream().anyMatch(fqcn::startsWith); |
| 143 | + if (isCustomSdk(fullyQualifiedName)) { |
| 144 | + log.info(() -> String.format("Skipping transformation for %s because it is a custom SDK", fullyQualifiedName)); |
| 145 | + return false; |
| 146 | + } |
| 147 | + return true; |
153 | 148 | }
|
154 | 149 |
|
155 | 150 | @Override
|
|
0 commit comments