From 11b1d05ae3801b5a85f3ae06f4a90970f12328d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Thu, 2 May 2024 15:08:58 +0200 Subject: [PATCH] progress MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../customresource/operator/GlueMetadata.java | 40 +++++++++++++++++++ .../operator/GlueOperatorSpec.java | 15 +++++-- .../glue/customresource/operator/Parent.java | 18 +++++++++ 3 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 src/main/java/io/csviri/operator/glue/customresource/operator/GlueMetadata.java diff --git a/src/main/java/io/csviri/operator/glue/customresource/operator/GlueMetadata.java b/src/main/java/io/csviri/operator/glue/customresource/operator/GlueMetadata.java new file mode 100644 index 0000000..d6479af --- /dev/null +++ b/src/main/java/io/csviri/operator/glue/customresource/operator/GlueMetadata.java @@ -0,0 +1,40 @@ +package io.csviri.operator.glue.customresource.operator; + +import java.util.Objects; + +public class GlueMetadata { + + String name; + String namespace; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getNamespace() { + return namespace; + } + + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @Override + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + GlueMetadata that = (GlueMetadata) o; + return Objects.equals(name, that.name) && Objects.equals(namespace, that.namespace); + } + + @Override + public int hashCode() { + return Objects.hash(name, namespace); + } +} diff --git a/src/main/java/io/csviri/operator/glue/customresource/operator/GlueOperatorSpec.java b/src/main/java/io/csviri/operator/glue/customresource/operator/GlueOperatorSpec.java index 2cc23dd..f485e63 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/operator/GlueOperatorSpec.java +++ b/src/main/java/io/csviri/operator/glue/customresource/operator/GlueOperatorSpec.java @@ -10,6 +10,8 @@ public class GlueOperatorSpec extends GlueSpec { @Required private Parent parent; + private GlueMetadata glueMetadata; + public Parent getParent() { return parent; } @@ -19,6 +21,14 @@ public GlueOperatorSpec setParent(Parent parent) { return this; } + public GlueMetadata getGlueMetadata() { + return glueMetadata; + } + + public void setGlueMetadata(GlueMetadata glueMetadata) { + this.glueMetadata = glueMetadata; + } + @Override public boolean equals(Object o) { if (this == o) @@ -28,12 +38,11 @@ public boolean equals(Object o) { if (!super.equals(o)) return false; GlueOperatorSpec that = (GlueOperatorSpec) o; - return Objects.equals(parent, that.parent); + return Objects.equals(parent, that.parent) && Objects.equals(glueMetadata, that.glueMetadata); } @Override public int hashCode() { - return Objects.hash(super.hashCode(), parent); + return Objects.hash(super.hashCode(), parent, glueMetadata); } - } diff --git a/src/main/java/io/csviri/operator/glue/customresource/operator/Parent.java b/src/main/java/io/csviri/operator/glue/customresource/operator/Parent.java index 45a6f5e..fde35ad 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/operator/Parent.java +++ b/src/main/java/io/csviri/operator/glue/customresource/operator/Parent.java @@ -1,5 +1,7 @@ package io.csviri.operator.glue.customresource.operator; +import java.util.Objects; + public class Parent { private String apiVersion; @@ -38,4 +40,20 @@ public String getLabelSelector() { public void setLabelSelector(String labelSelector) { this.labelSelector = labelSelector; } + + @Override + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + Parent parent = (Parent) o; + return Objects.equals(apiVersion, parent.apiVersion) && Objects.equals(kind, parent.kind) + && Objects.equals(labelSelector, parent.labelSelector); + } + + @Override + public int hashCode() { + return Objects.hash(apiVersion, kind, labelSelector); + } }