Skip to content

Commit 8f446a7

Browse files
csvirimetacosm
authored andcommitted
Fixing Javadoc that blocks the snapshot release
1 parent 0dc0de1 commit 8f446a7

File tree

7 files changed

+12
-37
lines changed

7 files changed

+12
-37
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ public static <T extends CustomResource> UpdateControl<T> updateStatusSubResourc
3434
/**
3535
* As a results of this there will be two call to K8S API. First the custom resource will be
3636
* updates then the status sub-resource.
37+
*
38+
* @param customResource - custom resource to use in both API calls
39+
* @return UpdateControl instance
3740
*/
3841
public static <T extends CustomResource> UpdateControl<T> updateCustomResourceAndStatus(
3942
T customResource) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public AbstractControllerConfiguration(String associatedControllerClassName, Str
1919
Set<String> namespaces,
2020
RetryConfiguration retryConfiguration) {
2121
super(associatedControllerClassName, name, crdName, finalizer, generationAware, namespaces,
22-
retryConfiguration);
22+
retryConfiguration, null, null, null, null);
2323
}
2424

2525
public AbstractControllerConfiguration(String associatedControllerClassName, String name,

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,11 @@ default boolean useFinalizer() {
103103

104104
/**
105105
* Allow controllers to filter events before they are provided to the
106-
* {@link io.javaoperatorsdk.operator.processing.event.EventHandler}.
107-
* </p>
108-
* Note that the provided filter is combined with {@link #isGenerationAware()} to compute the
109-
* final set of fiolters that should be applied;
106+
* {@link io.javaoperatorsdk.operator.processing.event.EventHandler}. Note that the provided
107+
* filter is combined with {@link #isGenerationAware()} to compute the final set of fiolters that
108+
* should be applied;
110109
*
111-
* @return
110+
* @return filter
112111
*/
113112
default CustomResourceEventFilter<R> getEventFilter() {
114113
return CustomResourceEventFilters.passthrough();

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

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -54,34 +54,6 @@ public DefaultControllerConfiguration(
5454
setConfigurationService(service);
5555
}
5656

57-
/**
58-
* @deprecated use
59-
* {@link #DefaultControllerConfiguration(String, String, String, String, boolean, Set, RetryConfiguration)}
60-
* instead
61-
*/
62-
@Deprecated
63-
public DefaultControllerConfiguration(
64-
String associatedControllerClassName,
65-
String name,
66-
String crdName,
67-
String finalizer,
68-
boolean generationAware,
69-
Set<String> namespaces,
70-
RetryConfiguration retryConfiguration) {
71-
this(
72-
associatedControllerClassName,
73-
name,
74-
crdName,
75-
finalizer,
76-
generationAware,
77-
namespaces,
78-
retryConfiguration,
79-
null,
80-
null,
81-
null,
82-
null);
83-
}
84-
8557
@Override
8658
public String getName() {
8759
return name;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/CustomResourceCache.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public void cacheResource(T resource, Predicate<T> predicate) {
6969
* We clone the object so the one in the cache is not changed by the controller or dispatcher.
7070
* Therefore the cached object always represents the object coming from the API server.
7171
*
72-
* @param uuid
73-
* @return
72+
* @param uuid identifier of resource
73+
* @return resource if found in cache
7474
*/
7575
public Optional<T> getLatestResource(String uuid) {
7676
return Optional.ofNullable(resources.get(uuid)).map(this::clone);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public interface Event {
1717
/**
1818
* The selector used to determine the {@link CustomResource} for which a reconcile loop should be
1919
* triggered.
20+
* @return predicate used to match the target CustomResource
2021
*/
2122
Predicate<CustomResource> getCustomResourcesSelector();
2223

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/retry/RetryExecution.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public interface RetryExecution extends RetryInfo {
1010
* Calculates the delay for the next execution. This method should return 0, when called first
1111
* time;
1212
*
13-
* @return
13+
* @return the time to wait until the next execution in milliseconds
1414
*/
1515
Optional<Long> nextDelay();
1616
}

0 commit comments

Comments
 (0)