@@ -131,7 +131,7 @@ public static <P extends HasMetadata> P ssaPatchAndCacheStatus(
131131 */
132132 public static <P extends HasMetadata > P ssaPatchAndCacheStatus (
133133 P primary , P freshResourceWithStatus , Context <P > context , PrimaryResourceCache <P > cache ) {
134- sanityChecks (freshResourceWithStatus , context );
134+ logWarnIfResourceVersionPresent (freshResourceWithStatus );
135135 return patchAndCacheStatus (
136136 primary ,
137137 cache ,
@@ -159,7 +159,7 @@ public static <P extends HasMetadata> P ssaPatchAndCacheStatus(
159159 */
160160 public static <P extends HasMetadata > P editAndCacheStatus (
161161 P primary , Context <P > context , PrimaryResourceCache <P > cache , UnaryOperator <P > operation ) {
162- sanityChecks (primary , context );
162+ logWarnIfResourceVersionPresent (primary );
163163 return patchAndCacheStatus (
164164 primary , cache , () -> context .getClient ().resource (primary ).editStatus (operation ));
165165 }
@@ -176,7 +176,7 @@ public static <P extends HasMetadata> P editAndCacheStatus(
176176 */
177177 public static <P extends HasMetadata > P patchAndCacheStatus (
178178 P primary , Context <P > context , PrimaryResourceCache <P > cache ) {
179- sanityChecks (primary , context );
179+ logWarnIfResourceVersionPresent (primary );
180180 return patchAndCacheStatus (
181181 primary , cache , () -> context .getClient ().resource (primary ).patchStatus ());
182182 }
@@ -192,7 +192,7 @@ public static <P extends HasMetadata> P patchAndCacheStatus(
192192 */
193193 public static <P extends HasMetadata > P updateAndCacheStatus (
194194 P primary , Context <P > context , PrimaryResourceCache <P > cache ) {
195- sanityChecks (primary , context );
195+ logWarnIfResourceVersionPresent (primary );
196196 return patchAndCacheStatus (
197197 primary , cache , () -> context .getClient ().resource (primary ).updateStatus ());
198198 }
@@ -213,12 +213,16 @@ public static <P extends HasMetadata> P patchAndCacheStatus(
213213 return updatedResource ;
214214 }
215215
216- private static <P extends HasMetadata > void sanityChecks (P primary , Context < P > context ) {
216+ private static <P extends HasMetadata > void logWarnIfResourceVersionPresent (P primary ) {
217217 if (primary .getMetadata ().getResourceVersion () != null ) {
218218 log .warn (
219219 "The metadata.resourceVersion of primary resource is NOT null, "
220220 + "using optimistic locking is discouraged for this purpose. " );
221221 }
222+ }
223+
224+ private static <P extends HasMetadata > void sanityChecks (P primary , Context <P > context ) {
225+ logWarnIfResourceVersionPresent (primary );
222226 if (!context
223227 .getControllerConfiguration ()
224228 .getConfigurationService ()
0 commit comments