Skip to content

Commit 83393ad

Browse files
scrocqueselscrocquesel
authored
refactor: fix Context is a raw type (#1037)
* refactor: fix Context is a raw type * style: reformat
1 parent 4056ba3 commit 83393ad

File tree

30 files changed

+51
-42
lines changed

30 files changed

+51
-42
lines changed

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ContextInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
import io.fabric8.kubernetes.api.model.HasMetadata;
44

55
public interface ContextInitializer<P extends HasMetadata> {
6-
void initContext(P primary, Context context);
6+
void initContext(P primary, Context<P> context);
77
}

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected R handleUpdate(R actual, R desired, P primary, Context<P> context) {
7070
return res;
7171
}
7272

73-
public Matcher.Result<R> match(R actualResource, P primary, Context context) {
73+
public Matcher.Result<R> match(R actualResource, P primary, Context<P> context) {
7474
return matcher.match(actualResource, primary, context);
7575
}
7676

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public R update(R actual, R target, P primary, Context<P> context) {
9999
return prepare(target, primary, "Updating").replace(updatedActual);
100100
}
101101

102-
public Result<R> match(R actualResource, P primary, Context context) {
102+
public Result<R> match(R actualResource, P primary, Context<P> context) {
103103
return matcher.match(actualResource, primary, context);
104104
}
105105

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ private void updatePostExecutionControlWithReschedule(
258258
}
259259

260260

261-
private PostExecutionControl<R> handleCleanup(R resource, Context context) {
261+
private PostExecutionControl<R> handleCleanup(R resource, Context<R> context) {
262262
log.debug(
263263
"Executing delete for resource: {} with version: {}",
264264
getName(resource),

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static class TestKubernetesDependentResource
7979
extends KubernetesDependentResource<Deployment, TestCustomResource> {
8080

8181
@Override
82-
protected Deployment desired(TestCustomResource primary, Context context) {
82+
protected Deployment desired(TestCustomResource primary, Context<TestCustomResource> context) {
8383
return null;
8484
}
8585
}

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResourceTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ public Optional<SampleExternalResource> fetchResource(HasMetadata primaryResourc
113113

114114
@Override
115115
public SampleExternalResource create(
116-
SampleExternalResource desired, TestCustomResource primary, Context context) {
116+
SampleExternalResource desired, TestCustomResource primary,
117+
Context<TestCustomResource> context) {
117118
return SampleExternalResource.testResource1();
118119
}
119120

@@ -122,15 +123,16 @@ public SampleExternalResource update(
122123
SampleExternalResource actual,
123124
SampleExternalResource desired,
124125
TestCustomResource primary,
125-
Context context) {
126+
Context<TestCustomResource> context) {
126127
return SampleExternalResource.testResource1();
127128
}
128129

129130
@Override
130-
public void delete(TestCustomResource primary, Context context) {}
131+
public void delete(TestCustomResource primary, Context<TestCustomResource> context) {}
131132

132133
@Override
133-
protected SampleExternalResource desired(TestCustomResource primary, Context context) {
134+
protected SampleExternalResource desired(TestCustomResource primary,
135+
Context<TestCustomResource> context) {
134136
return SampleExternalResource.testResource1();
135137
}
136138
}

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public MyController(Consumer<TestCustomResource> consumer) {
151151

152152
@Override
153153
public UpdateControl<TestCustomResource> reconcile(
154-
TestCustomResource resource, Context context) {
154+
TestCustomResource resource, Context<TestCustomResource> context) {
155155

156156
LOGGER.info("Received event on: {}", resource);
157157

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/DuplicateCRController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class DuplicateCRController implements Reconciler<TestCustomResource> {
1010

1111
@Override
1212
public UpdateControl<TestCustomResource> reconcile(TestCustomResource resource,
13-
Context context) {
13+
Context<TestCustomResource> context) {
1414
return UpdateControl.noUpdate();
1515
}
1616
}

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconciler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public TestCustomReconciler(KubernetesClient kubernetesClient, boolean updateSta
3636

3737
@Override
3838
public DeleteControl cleanup(
39-
TestCustomResource resource, Context context) {
39+
TestCustomResource resource, Context<TestCustomResource> context) {
4040
Boolean delete =
4141
kubernetesClient
4242
.configMaps()
@@ -59,7 +59,7 @@ public DeleteControl cleanup(
5959

6060
@Override
6161
public UpdateControl<TestCustomResource> reconcile(
62-
TestCustomResource resource, Context context) {
62+
TestCustomResource resource, Context<TestCustomResource> context) {
6363
if (!resource.getMetadata().getFinalizers().contains(FINALIZER_NAME)) {
6464
throw new IllegalStateException("Finalizer is not present.");
6565
}

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconcilerOtherV1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class TestCustomReconcilerOtherV1 implements Reconciler<TestCustomResourc
1010

1111
@Override
1212
public UpdateControl<TestCustomResourceOtherV1> reconcile(TestCustomResourceOtherV1 resource,
13-
Context context) {
13+
Context<TestCustomResourceOtherV1> context) {
1414
return UpdateControl.noUpdate();
1515
}
1616
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/AnnotationControllerConfigurationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ private static class OneDepReconciler implements Reconciler<ConfigMap> {
4343
public static final String CONFIGURED_NS = "foo";
4444

4545
@Override
46-
public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context context) {
46+
public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap> context) {
4747
return null;
4848
}
4949
}
5050

5151
private static class NoDepReconciler implements Reconciler<ConfigMap> {
5252

5353
@Override
54-
public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context context) {
54+
public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap> context) {
5555
return null;
5656
}
5757
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/DefaultConfigurationServiceTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static class TestCustomFinalizerReconciler
106106

107107
@Override
108108
public UpdateControl<TestCustomFinalizerReconciler.InnerCustomResource> reconcile(
109-
InnerCustomResource resource, Context context) {
109+
InnerCustomResource resource, Context<InnerCustomResource> context) {
110110
return null;
111111
}
112112

@@ -123,7 +123,7 @@ static class NotAutomaticallyCreated implements Reconciler<TestCustomResource> {
123123

124124
@Override
125125
public UpdateControl<TestCustomResource> reconcile(
126-
TestCustomResource resource, Context context) {
126+
TestCustomResource resource, Context<TestCustomResource> context) {
127127
return null;
128128
}
129129
}
@@ -133,7 +133,7 @@ static class TestCustomReconciler implements Reconciler<TestCustomResource> {
133133

134134
@Override
135135
public UpdateControl<TestCustomResource> reconcile(
136-
TestCustomResource resource, Context context) {
136+
TestCustomResource resource, Context<TestCustomResource> context) {
137137
return null;
138138
}
139139
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ public class CreateUpdateEventFilterTestReconciler
3030

3131
@Override
3232
public UpdateControl<CreateUpdateEventFilterTestCustomResource> reconcile(
33-
CreateUpdateEventFilterTestCustomResource resource, Context context) {
33+
CreateUpdateEventFilterTestCustomResource resource,
34+
Context<CreateUpdateEventFilterTestCustomResource> context) {
3435
numberOfExecutions.incrementAndGet();
3536

3637
ConfigMap configMap =

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/customfilter/CustomFilteringTestReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class CustomFilteringTestReconciler implements Reconciler<CustomFiltering
1414

1515
@Override
1616
public UpdateControl<CustomFilteringTestResource> reconcile(CustomFilteringTestResource resource,
17-
Context context) {
17+
Context<CustomFilteringTestResource> context) {
1818
numberOfExecutions.incrementAndGet();
1919
return UpdateControl.noUpdate();
2020
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/deployment/DeploymentReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class DeploymentReconciler
2626

2727
@Override
2828
public UpdateControl<Deployment> reconcile(
29-
Deployment resource, Context context) {
29+
Deployment resource, Context<Deployment> context) {
3030

3131
log.info("Reconcile deployment: {}", resource);
3232
numberOfExecutions.incrementAndGet();

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class DoubleUpdateTestCustomReconciler
2424

2525
@Override
2626
public UpdateControl<DoubleUpdateTestCustomResource> reconcile(
27-
DoubleUpdateTestCustomResource resource, Context context) {
27+
DoubleUpdateTestCustomResource resource, Context<DoubleUpdateTestCustomResource> context) {
2828
numberOfExecutions.addAndGet(1);
2929

3030
log.info("Value: " + resource.getSpec().getValue());

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class EventSourceTestCustomReconciler
1919

2020
@Override
2121
public UpdateControl<EventSourceTestCustomResource> reconcile(
22-
EventSourceTestCustomResource resource, Context context) {
22+
EventSourceTestCustomResource resource, Context<EventSourceTestCustomResource> context) {
2323

2424
numberOfExecutions.addAndGet(1);
2525
ensureStatusExists(resource);

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ public List<EventSource> prepareEventSources(
4848

4949
@Override
5050
public UpdateControl<InformerEventSourceTestCustomResource> reconcile(
51-
InformerEventSourceTestCustomResource resource, Context context) {
51+
InformerEventSourceTestCustomResource resource,
52+
Context<InformerEventSourceTestCustomResource> context) {
5253
numberOfExecutions.incrementAndGet();
5354

5455
resource.setStatus(new InformerEventSourceTestCustomResourceStatus());

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/maxinterval/MaxIntervalTestReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class MaxIntervalTestReconciler
1818

1919
@Override
2020
public UpdateControl<MaxIntervalTestCustomResource> reconcile(
21-
MaxIntervalTestCustomResource resource, Context context) {
21+
MaxIntervalTestCustomResource resource, Context<MaxIntervalTestCustomResource> context) {
2222
numberOfExecutions.addAndGet(1);
2323
return UpdateControl.noUpdate();
2424
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler1.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public class MultiVersionCRDTestReconciler1
1818

1919
@Override
2020
public UpdateControl<MultiVersionCRDTestCustomResource1> reconcile(
21-
MultiVersionCRDTestCustomResource1 resource, Context context) {
21+
MultiVersionCRDTestCustomResource1 resource,
22+
Context<MultiVersionCRDTestCustomResource1> context) {
2223
log.info("Reconcile MultiVersionCRDTestCustomResource1: {}",
2324
resource.getMetadata().getName());
2425
resource.getStatus().setValue1(resource.getStatus().getValue1() + 1);

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler2.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public class MultiVersionCRDTestReconciler2
2020

2121
@Override
2222
public UpdateControl<MultiVersionCRDTestCustomResource2> reconcile(
23-
MultiVersionCRDTestCustomResource2 resource, Context context) {
23+
MultiVersionCRDTestCustomResource2 resource,
24+
Context<MultiVersionCRDTestCustomResource2> context) {
2425
log.info("Reconcile MultiVersionCRDTestCustomResource2: {}",
2526
resource.getMetadata().getName());
2627
resource.getStatus().setValue1(resource.getStatus().getValue1() + 1);

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/observedgeneration/ObservedGenerationTestReconciler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ public class ObservedGenerationTestReconciler
1515

1616
@Override
1717
public UpdateControl<ObservedGenerationTestCustomResource> reconcile(
18-
ObservedGenerationTestCustomResource resource, Context context) {
18+
ObservedGenerationTestCustomResource resource,
19+
Context<ObservedGenerationTestCustomResource> context) {
1920
log.info("Reconcile ObservedGenerationTestCustomResource: {}",
2021
resource.getMetadata().getName());
2122
return UpdateControl.updateStatus(resource);

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestReconciler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void setKubernetesClient(KubernetesClient kubernetesClient) {
5959

6060
@Override
6161
public DeleteControl cleanup(
62-
TestCustomResource resource, Context context) {
62+
TestCustomResource resource, Context<TestCustomResource> context) {
6363
Boolean delete =
6464
kubernetesClient
6565
.configMaps()
@@ -82,7 +82,7 @@ public DeleteControl cleanup(
8282

8383
@Override
8484
public UpdateControl<TestCustomResource> reconcile(
85-
TestCustomResource resource, Context context) {
85+
TestCustomResource resource, Context<TestCustomResource> context) {
8686
numberOfExecutions.addAndGet(1);
8787
if (!resource.getMetadata().getFinalizers().contains(FINALIZER_NAME)) {
8888
throw new IllegalStateException("Finalizer is not present.");

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public List<EventSource> prepareEventSources(
3939

4040
@Override
4141
public UpdateControl<StandaloneDependentTestCustomResource> reconcile(
42-
StandaloneDependentTestCustomResource primary, Context context) {
42+
StandaloneDependentTestCustomResource primary,
43+
Context<StandaloneDependentTestCustomResource> context) {
4344
deploymentDependent.reconcile(primary, context);
4445
Optional<Deployment> deployment = deploymentDependent.getResource(primary);
4546
if (deployment.isEmpty()) {

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class SubResourceTestCustomReconciler
2929

3030
@Override
3131
public UpdateControl<SubResourceTestCustomResource> reconcile(
32-
SubResourceTestCustomResource resource, Context context) {
32+
SubResourceTestCustomResource resource, Context<SubResourceTestCustomResource> context) {
3333
numberOfExecutions.addAndGet(1);
3434
if (!resource.getMetadata().getFinalizers().contains(FINALIZER_NAME)) {
3535
throw new IllegalStateException("Finalizer is not present.");

‎sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SecretDependentResource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private static String encode(String value) {
2727
}
2828

2929
@Override
30-
protected Secret desired(MySQLSchema schema, Context context) {
30+
protected Secret desired(MySQLSchema schema, Context<MySQLSchema> context) {
3131
final var password = RandomStringUtils
3232
.randomAlphanumeric(16); // NOSONAR: we don't need cryptographically-strong randomness here
3333
final var name = schema.getMetadata().getName();
@@ -49,7 +49,7 @@ private String getSecretName(String name) {
4949
}
5050

5151
@Override
52-
public Result<Secret> match(Secret actual, MySQLSchema primary, Context context) {
52+
public Result<Secret> match(Secret actual, MySQLSchema primary, Context<MySQLSchema> context) {
5353
final var desiredSecretName = getSecretName(primary.getMetadata().getName());
5454
return Result.nonComputed(actual.getMetadata().getName().equals(desiredSecretName));
5555
}

‎sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ private static String tomcatImage(Tomcat tomcat) {
1919
}
2020

2121
@Override
22-
protected Deployment desired(Tomcat tomcat, Context context) {
22+
protected Deployment desired(Tomcat tomcat, Context<Tomcat> context) {
2323
Deployment deployment =
2424
ReconcilerUtils.loadYaml(Deployment.class, getClass(), "deployment.yaml");
2525
final ObjectMeta tomcatMetadata = tomcat.getMetadata();

‎sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class ServiceDependentResource extends KubernetesDependentResource<Servic
1313
implements Creator<Service, Tomcat>, Updater<Service, Tomcat> {
1414

1515
@Override
16-
protected Service desired(Tomcat tomcat, Context context) {
16+
protected Service desired(Tomcat tomcat, Context<Tomcat> context) {
1717
final ObjectMeta tomcatMetadata = tomcat.getMetadata();
1818
return new ServiceBuilder(ReconcilerUtils.loadYaml(Service.class, getClass(), "service.yaml"))
1919
.editMetadata()

‎sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconcilerDependentResources.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public List<EventSource> prepareEventSources(EventSourceContext<WebPage> context
5151
}
5252

5353
@Override
54-
public UpdateControl<WebPage> reconcile(WebPage webPage, Context context) {
54+
public UpdateControl<WebPage> reconcile(WebPage webPage, Context<WebPage> context) {
5555
if (webPage.getSpec().getHtml().contains("error")) {
5656
// special case just to showcase error if doing a demo
5757
throw new ErrorSimulationException("Simulating error");
@@ -166,7 +166,7 @@ private class ConfigMapDependentResource
166166
PrimaryToSecondaryMapper<WebPage> {
167167

168168
@Override
169-
protected ConfigMap desired(WebPage webPage, Context context) {
169+
protected ConfigMap desired(WebPage webPage, Context<WebPage> context) {
170170
Map<String, String> data = new HashMap<>();
171171
data.put("index.html", webPage.getSpec().getHtml());
172172
return new ConfigMapBuilder()
@@ -180,7 +180,8 @@ protected ConfigMap desired(WebPage webPage, Context context) {
180180
}
181181

182182
@Override
183-
public ConfigMap update(ConfigMap actual, ConfigMap target, WebPage primary, Context context) {
183+
public ConfigMap update(ConfigMap actual, ConfigMap target, WebPage primary,
184+
Context<WebPage> context) {
184185
var res = super.update(actual, target, primary, context);
185186
var ns = actual.getMetadata().getNamespace();
186187
log.info("Restarting pods because HTML has changed in {}", ns);

‎smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceReconciler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ public CustomServiceReconciler(KubernetesClient kubernetesClient) {
3030
}
3131

3232
@Override
33-
public DeleteControl cleanup(CustomService resource, Context context) {
33+
public DeleteControl cleanup(CustomService resource, Context<CustomService> context) {
3434
log.info("Cleaning up for: {}", resource.getMetadata().getName());
3535
return Reconciler.super.cleanup(resource, context);
3636
}
3737

3838
@Override
3939
public UpdateControl<CustomService> reconcile(
40-
CustomService resource, Context context) {
40+
CustomService resource, Context<CustomService> context) {
4141
log.info("Reconciling: {}", resource.getMetadata().getName());
4242

4343
ServicePort servicePort = new ServicePort();

0 commit comments

Comments
 (0)