From 2f169b57ceadcfe80535ac3598c1cdbd8b876a45 Mon Sep 17 00:00:00 2001 From: David Kornel Date: Thu, 16 May 2024 15:47:09 +0200 Subject: [PATCH 1/2] Change ResoruceItem class to record type Signed-off-by: David Kornel --- .../resources/KubeResourceManager.java | 6 +-- .../testframe/resources/ResourceItem.java | 38 +++---------------- 2 files changed, 9 insertions(+), 35 deletions(-) diff --git a/test-frame-common/src/main/java/io/skodjob/testframe/resources/KubeResourceManager.java b/test-frame-common/src/main/java/io/skodjob/testframe/resources/KubeResourceManager.java index 643f0a8..ad80cd5 100644 --- a/test-frame-common/src/main/java/io/skodjob/testframe/resources/KubeResourceManager.java +++ b/test-frame-common/src/main/java/io/skodjob/testframe/resources/KubeResourceManager.java @@ -393,14 +393,14 @@ public void deleteResources() { ResourceItem resourceItem = s.pop(); try { - resourceItem.getThrowableRunner().run(); + resourceItem.throwableRunner().run(); } catch (Exception e) { e.printStackTrace(); } numberOfResources.decrementAndGet(); deleteCallbacks.forEach(callback -> { - if (resourceItem.getResource() != null) { - callback.accept(resourceItem.getResource()); + if (resourceItem.resource() != null) { + callback.accept(resourceItem.resource()); } }); } diff --git a/test-frame-common/src/main/java/io/skodjob/testframe/resources/ResourceItem.java b/test-frame-common/src/main/java/io/skodjob/testframe/resources/ResourceItem.java index 85f495c..b08ee54 100644 --- a/test-frame-common/src/main/java/io/skodjob/testframe/resources/ResourceItem.java +++ b/test-frame-common/src/main/java/io/skodjob/testframe/resources/ResourceItem.java @@ -9,45 +9,19 @@ /** * Represents an item containing a Kubernetes resource and a runnable action. + * * @param Type of Kubernetes resource. */ -public final class ResourceItem { - - private final ThrowableRunner throwableRunner; - private final T resource; - - /** - * Constructs a ResourceItem with the given runnable action and resource. - * @param throwableRunner The runnable action to execute. - * @param resource The Kubernetes resource associated with the action. - */ - public ResourceItem(ThrowableRunner throwableRunner, T resource) { - this.throwableRunner = throwableRunner; - this.resource = resource; - } +public record ResourceItem( + ThrowableRunner throwableRunner, + T resource) { /** * Constructs a ResourceItem with the given runnable action. + * * @param throwableRunner The runnable action to execute. */ public ResourceItem(ThrowableRunner throwableRunner) { - this.throwableRunner = throwableRunner; - this.resource = null; - } - - /** - * Gets the runnable action associated with this resource item. - * @return The runnable action. - */ - public ThrowableRunner getThrowableRunner() { - return throwableRunner; - } - - /** - * Gets the Kubernetes resource associated with this resource item. - * @return The Kubernetes resource. - */ - public T getResource() { - return resource; + this(throwableRunner, null); } } From c857bed10881b4b2fc7b9ca032d17d9148fbeb5a Mon Sep 17 00:00:00 2001 From: David Kornel Date: Thu, 16 May 2024 15:51:08 +0200 Subject: [PATCH 2/2] fix javadoc Signed-off-by: David Kornel --- .../java/io/skodjob/testframe/resources/ResourceItem.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test-frame-common/src/main/java/io/skodjob/testframe/resources/ResourceItem.java b/test-frame-common/src/main/java/io/skodjob/testframe/resources/ResourceItem.java index b08ee54..922d066 100644 --- a/test-frame-common/src/main/java/io/skodjob/testframe/resources/ResourceItem.java +++ b/test-frame-common/src/main/java/io/skodjob/testframe/resources/ResourceItem.java @@ -10,7 +10,9 @@ /** * Represents an item containing a Kubernetes resource and a runnable action. * - * @param Type of Kubernetes resource. + * @param throwableRunner delete method + * @param resource resource (can be null) + * @param Type of kubernetes resource */ public record ResourceItem( ThrowableRunner throwableRunner,