Skip to content

Commit 544860a

Browse files
committed
rebase next
1 parent 47ee101 commit 544860a

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/AnnotationControllerConfiguration.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@ public RateLimiter getRateLimiter() {
167167
@SuppressWarnings("unchecked")
168168
public Optional<Predicate<P>> onAddFilter() {
169169
return (Optional<Predicate<P>>) createFilter(annotation.onAddFilter(), FilterType.onAdd,
170-
annotation.getClass().getSimpleName());
170+
annotation.getClass().getSimpleName());
171171
}
172172

173173
private enum FilterType {
174174
onAdd(VoidOnAddFilter.class), onUpdate(VoidOnUpdateFilter.class), onDelete(
175-
VoidOnDeleteFilter.class), generic(VoidGenericFilter.class);
175+
VoidOnDeleteFilter.class), generic(VoidGenericFilter.class);
176176

177177
final Class<?> defaultValue;
178178

@@ -189,11 +189,11 @@ private <T> Optional<T> createFilter(Class<T> filter, FilterType filterType, Str
189189
var instance = (T) filter.getDeclaredConstructor().newInstance();
190190
return Optional.of(instance);
191191
} catch (InstantiationException | IllegalAccessException | InvocationTargetException
192-
| NoSuchMethodException e) {
192+
| NoSuchMethodException e) {
193193
throw new OperatorException(
194-
"Couldn't create " + filterType + " filter from " + filter.getName() + " class in "
195-
+ origin + " for reconciler " + getName(),
196-
e);
194+
"Couldn't create " + filterType + " filter from " + filter.getName() + " class in "
195+
+ origin + " for reconciler " + getName(),
196+
e);
197197
}
198198
}
199199
}

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ControllerManagerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private static class TestControllerConfiguration<R extends HasMetadata>
6363
public TestControllerConfiguration(Reconciler<R> controller, Class<R> crClass) {
6464
super(null, getControllerName(controller),
6565
CustomResource.getCRDName(crClass), null, false, null, null, null, null, crClass,
66-
null, null, null, null, null);
66+
null, null, null, null, null, null);
6767
this.controller = controller;
6868
}
6969

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
@@ -136,7 +136,7 @@ public static class MyConfiguration extends DefaultControllerConfiguration<TestC
136136
public MyConfiguration() {
137137
super(MyController.class.getCanonicalName(), "mycontroller", null, Constants.NO_VALUE_SET,
138138
false, null,
139-
null, null, null, TestCustomResource.class, null,null, null, null,
139+
null, null, null, TestCustomResource.class, null, null, null, null,
140140
new PeriodRateLimiter(), null);
141141
}
142142
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public ControllerConfig(String finalizer, boolean generationAware,
145145
eventFilter,
146146
customResourceClass,
147147
null,
148-
null, null, null, null,null);
148+
null, null, null, null, null);
149149
}
150150
}
151151

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSourceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public TestConfiguration(boolean generationAware, Predicate<TestCustomResource>
187187
null,
188188
TestCustomResource.class,
189189
null,
190-
onAddFilter, onUpdateFilter, genericFilter,null, null);
190+
onAddFilter, onUpdateFilter, genericFilter, null, null);
191191
}
192192
}
193193
}

0 commit comments

Comments
 (0)