Skip to content

Commit 3c438d3

Browse files
csviricsviri
committed
wip
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent 32adc22 commit 3c438d3

File tree

3 files changed

+62
-25
lines changed

3 files changed

+62
-25
lines changed

‎migration/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
<version>${openrewrite.version}</version>
5050
<scope>test</scope>
5151
</dependency>
52+
<dependency>
53+
<groupId>org.openrewrite</groupId>
54+
<artifactId>rewrite-java-17</artifactId>
55+
<version>${openrewrite.version}</version>
56+
<scope>test</scope>
57+
</dependency>
5258
<dependency>
5359
<groupId>org.junit.jupiter</groupId>
5460
<artifactId>junit-jupiter-api</artifactId>

‎migration/src/main/resources/META-INF/rewrite/v5-3-migration.yml‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,34 @@ description: >-
2222
Migrates Java Operator SDK from v5.2 to v5.3, including the JUnit module
2323
rename and Metrics interface method renames.
2424
recipeList:
25+
- io.javaoperatorsdk.operator.migration.UpgradeJOSDKVersion
2526
- io.javaoperatorsdk.operator.migration.RenameJUnitModule
2627
- io.javaoperatorsdk.operator.migration.MetricsMethodRenames
2728
- io.javaoperatorsdk.operator.migration.RemoveMonitorSizeOf
2829
---
2930
type: specs.openrewrite.org/v1beta/recipe
31+
name: io.javaoperatorsdk.operator.migration.UpgradeJOSDKVersion
32+
displayName: Upgrade Java Operator SDK version to 5.3.0
33+
description: >-
34+
Upgrades all io.javaoperatorsdk dependencies from 5.2.x to 5.3.0.
35+
recipeList:
36+
- org.openrewrite.maven.UpgradeDependencyVersion:
37+
groupId: io.javaoperatorsdk
38+
artifactId: "*"
39+
newVersion: 5.3.0
40+
versionPattern: "5.2.*"
41+
---
42+
type: specs.openrewrite.org/v1beta/recipe
3043
name: io.javaoperatorsdk.operator.migration.RenameJUnitModule
3144
displayName: Rename JUnit module artifact
3245
description: >-
3346
Renames the operator-framework-junit-5 artifact to operator-framework-junit.
3447
recipeList:
35-
- org.openrewrite.maven.ChangeArtifactId:
36-
groupId: io.javaoperatorsdk
48+
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
49+
oldGroupId: io.javaoperatorsdk
3750
oldArtifactId: operator-framework-junit-5
3851
newArtifactId: operator-framework-junit
52+
newVersion: 5.3.0
3953
---
4054
type: specs.openrewrite.org/v1beta/recipe
4155
name: io.javaoperatorsdk.operator.migration.MetricsMethodRenames
@@ -46,24 +60,36 @@ recipeList:
4660
- org.openrewrite.java.ChangeMethodName:
4761
methodPattern: "io.javaoperatorsdk.operator.api.monitoring.Metrics reconcileCustomResource(..)"
4862
newMethodName: reconciliationSubmitted
63+
matchOverrides: true
4964
- org.openrewrite.java.ChangeMethodName:
5065
methodPattern: "io.javaoperatorsdk.operator.api.monitoring.Metrics reconciliationExecutionStarted(..)"
5166
newMethodName: reconciliationStarted
67+
matchOverrides: true
5268
- org.openrewrite.java.ChangeMethodName:
5369
methodPattern: "io.javaoperatorsdk.operator.api.monitoring.Metrics reconciliationExecutionFinished(..)"
5470
newMethodName: reconciliationSucceeded
71+
matchOverrides: true
5572
- org.openrewrite.java.ChangeMethodName:
5673
methodPattern: "io.javaoperatorsdk.operator.api.monitoring.Metrics failedReconciliation(..)"
5774
newMethodName: reconciliationFailed
75+
matchOverrides: true
5876
- org.openrewrite.java.ChangeMethodName:
5977
methodPattern: "io.javaoperatorsdk.operator.api.monitoring.Metrics finishedReconciliation(..)"
6078
newMethodName: reconciliationFinished
79+
matchOverrides: true
80+
- org.openrewrite.java.AddMethodParameter:
81+
methodPattern: "io.javaoperatorsdk.operator.api.monitoring.Metrics reconciliationFinished(..)"
82+
parameterType: io.javaoperatorsdk.operator.api.reconciler.RetryInfo
83+
parameterName: retryInfo
84+
parameterIndex: 1
6185
- org.openrewrite.java.ChangeMethodName:
6286
methodPattern: "io.javaoperatorsdk.operator.api.monitoring.Metrics cleanupDoneFor(..)"
6387
newMethodName: cleanupDone
88+
matchOverrides: true
6489
- org.openrewrite.java.ChangeMethodName:
6590
methodPattern: "io.javaoperatorsdk.operator.api.monitoring.Metrics receivedEvent(..)"
6691
newMethodName: eventReceived
92+
matchOverrides: true
6793
---
6894
type: specs.openrewrite.org/v1beta/recipe
6995
name: io.javaoperatorsdk.operator.migration.RemoveMonitorSizeOf

‎migration/src/test/java/io/javaoperatorsdk/operator/migration/V53MigrationTest.java‎

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void renamesJUnitModuleInMaven() {
5959
<dependency>
6060
<groupId>io.javaoperatorsdk</groupId>
6161
<artifactId>operator-framework-junit</artifactId>
62-
<version>5.2.0</version>
62+
<version>5.3.0</version>
6363
<scope>test</scope>
6464
</dependency>
6565
</dependencies>
@@ -76,38 +76,33 @@ void renamesMetricsMethods() {
7676
package io.javaoperatorsdk.operator.api.monitoring;
7777
7878
import java.util.Map;
79-
import io.fabric8.kubernetes.api.model.HasMetadata;
80-
import io.javaoperatorsdk.operator.api.reconciler.RetryInfo;
81-
import io.javaoperatorsdk.operator.processing.event.Event;
82-
import io.javaoperatorsdk.operator.processing.event.ResourceID;
8379
8480
public interface Metrics {
85-
default void receivedEvent(Event event, Map<String, Object> metadata) {}
86-
default void reconcileCustomResource(HasMetadata resource, RetryInfo retryInfo, Map<String, Object> metadata) {}
87-
default void reconciliationExecutionStarted(HasMetadata resource, Map<String, Object> metadata) {}
88-
default void reconciliationExecutionFinished(HasMetadata resource, Map<String, Object> metadata) {}
89-
default void failedReconciliation(HasMetadata resource, RetryInfo retryInfo, Exception exception, Map<String, Object> metadata) {}
90-
default void finishedReconciliation(HasMetadata resource, Map<String, Object> metadata) {}
91-
default void cleanupDoneFor(ResourceID resourceID, Map<String, Object> metadata) {}
81+
default void receivedEvent(Object event, Map<String, Object> metadata) {}
82+
default void reconcileCustomResource(Object resource, Object retryInfo, Map<String, Object> metadata) {}
83+
default void reconciliationExecutionStarted(Object resource, Map<String, Object> metadata) {}
84+
default void reconciliationExecutionFinished(Object resource, Map<String, Object> metadata) {}
85+
default void failedReconciliation(Object resource, Object retryInfo, Exception exception, Map<String, Object> metadata) {}
86+
default void finishedReconciliation(Object resource, Map<String, Object> metadata) {}
87+
default void cleanupDoneFor(Object resourceID, Map<String, Object> metadata) {}
9288
}
9389
""",
9490
"""
9591
package io.javaoperatorsdk.operator.api.monitoring;
9692
97-
import java.util.Map;
98-
import io.fabric8.kubernetes.api.model.HasMetadata;
9993
import io.javaoperatorsdk.operator.api.reconciler.RetryInfo;
100-
import io.javaoperatorsdk.operator.processing.event.Event;
101-
import io.javaoperatorsdk.operator.processing.event.ResourceID;
94+
95+
import java.util.Map;
10296
10397
public interface Metrics {
104-
default void eventReceived(Event event, Map<String, Object> metadata) {}
105-
default void reconciliationSubmitted(HasMetadata resource, RetryInfo retryInfo, Map<String, Object> metadata) {}
106-
default void reconciliationStarted(HasMetadata resource, Map<String, Object> metadata) {}
107-
default void reconciliationSucceeded(HasMetadata resource, Map<String, Object> metadata) {}
108-
default void reconciliationFailed(HasMetadata resource, RetryInfo retryInfo, Exception exception, Map<String, Object> metadata) {}
109-
default void reconciliationFinished(HasMetadata resource, Map<String, Object> metadata) {}
110-
default void cleanupDone(ResourceID resourceID, Map<String, Object> metadata) {}
98+
default void eventReceived(Object event, Map<String, Object> metadata) {}
99+
default void reconciliationSubmitted(Object resource, Object retryInfo, Map<String, Object> metadata) {}
100+
default void reconciliationStarted(Object resource, Map<String, Object> metadata) {}
101+
default void reconciliationSucceeded(Object resource, Map<String, Object> metadata) {}
102+
default void reconciliationFailed(Object resource, Object retryInfo, Exception exception, Map<String, Object> metadata) {}
103+
104+
default void reconciliationFinished(Object resource, RetryInfo retryInfo, Map<String, Object> metadata) {}
105+
default void cleanupDone(Object resourceID, Map<String, Object> metadata) {}
111106
}
112107
"""));
113108
}
@@ -127,6 +122,16 @@ public interface Metrics {
127122
default void receivedEvent(Object event, Map<String, Object> metadata) {}
128123
default void reconcileCustomResource(Object resource, Object retryInfo, Map<String, Object> metadata) {}
129124
}
125+
""",
126+
"""
127+
package io.javaoperatorsdk.operator.api.monitoring;
128+
129+
import java.util.Map;
130+
131+
public interface Metrics {
132+
default void eventReceived(Object event, Map<String, Object> metadata) {}
133+
default void reconciliationSubmitted(Object resource, Object retryInfo, Map<String, Object> metadata) {}
134+
}
130135
"""),
131136
// Implementation that overrides the old method names
132137
// language=java

0 commit comments

Comments
 (0)