-
Notifications
You must be signed in to change notification settings - Fork 889
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Migration tool - Date to Instant #5986
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 88 additions & 0 deletions
88
v2-migration/src/main/java/software/amazon/awssdk/v2migration/DateToInstant.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package software.amazon.awssdk.v2migration; | ||
|
|
||
| import java.util.Date; | ||
| import java.util.List; | ||
| import java.util.regex.Pattern; | ||
| import org.openrewrite.ExecutionContext; | ||
| import org.openrewrite.NlsRewrite; | ||
| import org.openrewrite.Recipe; | ||
| import org.openrewrite.TreeVisitor; | ||
| import org.openrewrite.java.JavaIsoVisitor; | ||
| import org.openrewrite.java.JavaTemplate; | ||
| import org.openrewrite.java.tree.J; | ||
| import org.openrewrite.java.tree.JavaType; | ||
| import software.amazon.awssdk.annotations.SdkInternalApi; | ||
| import software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils; | ||
|
|
||
| @SdkInternalApi | ||
| public class DateToInstant extends Recipe { | ||
| private static final Pattern DATE_PATTERN = Pattern.compile(Date.class.getCanonicalName()); | ||
|
|
||
| @Override | ||
| public @NlsRewrite.DisplayName String getDisplayName() { | ||
| return "Convert Date to Instant"; | ||
| } | ||
|
|
||
| @Override | ||
| public @NlsRewrite.Description String getDescription() { | ||
| return "Convert Date to Instant by calling Date#toInstant"; | ||
| } | ||
|
|
||
| @Override | ||
| public TreeVisitor<?, ExecutionContext> getVisitor() { | ||
| return new DateToInstantVisitor(); | ||
| } | ||
|
|
||
| private static final class DateToInstantVisitor extends JavaIsoVisitor<ExecutionContext> { | ||
|
|
||
| @Override | ||
| public J.MethodInvocation visitMethodInvocation(J.MethodInvocation originalMethod, ExecutionContext ctx) { | ||
| J.MethodInvocation method = super.visitMethodInvocation(originalMethod, ctx); | ||
|
|
||
| if (!isV2ModelSetterWithDateParam(method)) { | ||
| return method; | ||
| } | ||
|
|
||
| JavaTemplate template = JavaTemplate.builder("#{any()}.toInstant()").contextSensitive().build(); | ||
|
|
||
| return template.apply(updateCursor(method), method.getCoordinates().replaceArguments(), method.getArguments().get(0)); | ||
| } | ||
|
|
||
| private static boolean isV2ModelSetterWithDateParam(J.MethodInvocation method) { | ||
| JavaType.Method mt = method.getMethodType(); | ||
|
|
||
| if (mt == null) { | ||
| return false; | ||
| } | ||
|
|
||
| JavaType.FullyQualified declaringType = mt.getDeclaringType(); | ||
| List<JavaType> parameterTypes = mt.getParameterTypes(); | ||
| if (parameterTypes.size() != 1) { | ||
| return false; | ||
| } | ||
|
|
||
| JavaType javaType = parameterTypes.get(0); | ||
| if (javaType == null) { | ||
| return false; | ||
| } | ||
|
|
||
| boolean isDateParam = javaType.isAssignableFrom(DATE_PATTERN); | ||
| return SdkTypeUtils.isV2ModelBuilder(declaringType) && isDateParam; | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we have special cases where Date objects should NOT be transformed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No Date in v2, will all be Instant afaik. At least for POJO setters