[OSJC-169] changed KubernetesResource#equals #hashCode to constant behav #18
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,14 +31,14 @@ | |
| * | ||
| * @author Jeff Cantrill | ||
| */ | ||
| public abstract class KubernetesResource implements IResource, ResourcePropertyKeys { | ||
|
|
||
| private ModelNode node; | ||
| private IClient client; | ||
| private Map<Class<? extends ICapability>, ICapability> capabilities = new HashMap<Class<? extends ICapability>, ICapability>(); | ||
| private Map<String, String []> propertyKeys; | ||
|
|
||
| protected KubernetesResource(ModelNode node, IClient client, Map<String, String []> propertyKeys){ | ||
| this.node = node; | ||
| this.client = client; | ||
| this.propertyKeys = propertyKeys; | ||
|
|
@@ -105,11 +105,11 @@ public void refresh(){ | |
| this.node = ModelNode.fromJSONString(client.get(getKind(), getName(), getNamespace()).toString()); | ||
| } | ||
|
|
||
| @Override | ||
| public ResourceKind getKind(){ | ||
| ModelNode kindNode = get(ResourcePropertyKeys.KIND); | ||
| if(kindNode.isDefined()){ | ||
| return ResourceKind.valueOf(kindNode.asString()); | ||
| } | ||
| return null; | ||
| } | ||
|
|
@@ -128,7 +128,6 @@ public String getName(){ | |
| return asString(NAME); | ||
| } | ||
|
|
||
| public void setName(String name) { | ||
| set(NAME, name); | ||
| } | ||
|
|
@@ -142,14 +141,13 @@ public String getNamespace(){ | |
| return node.asString(); | ||
| } | ||
|
|
||
| public void setNamespace(String namespace){ | ||
| set(NAMESPACE, namespace); | ||
| } | ||
|
|
||
| @Override | ||
| public void addLabel(String key, String value) { | ||
| ModelNode labels = node.get(ResourcePropertyKeys.LABELS); | ||
| labels.get(key).set(value); | ||
| } | ||
|
|
||
|
|
@@ -161,20 +159,25 @@ public Map<String, String> getLabels() { | |
|
|
||
| /*---------- utility methods ------*/ | ||
| protected ModelNode get(String key){ | ||
| return node.get(getPath(key)); | ||
| } | ||
|
|
||
| protected void set(String key, int value) { | ||
| node.get(getPath(key)).set(value); | ||
| } | ||
|
|
||
| protected void set(String key, String value){ | ||
| node.get(getPath(key)).set(value); | ||
| } | ||
|
|
||
| private String[] getPath(String key) { | ||
| String [] property = propertyKeys.get(key); | ||
| if (property == null) { | ||
|
There was a problem hiding this comment. @adietish we should consider throwing here/providing an indication that the path doesnt exist. If the path doesnt exist for a given property then it needs to be added to the map IMO. There was a problem hiding this comment. @jcantrill isnt the property map a mapping so that if a special mapping is missing it indicates that the key is to be used as is? What is the purpose of these property-keys? |
||
| throw new IllegalArgumentException(String.format("key %s is not known to the resource %s", key, getName().isEmpty()? getClass().getSimpleName() : getName())); | ||
| } | ||
| return property; | ||
| } | ||
|
|
||
| protected Map<String, String> asMap(String property){ | ||
| return JBossDmrExtentions.asMap(this.node, propertyKeys, property); | ||
| } | ||
|
|
@@ -203,26 +206,52 @@ public String toPrettyString(){ | |
|
|
||
| @Override | ||
| public int hashCode() { | ||
| String namespace = getNamespace(); | ||
| String name = getName(); | ||
| ResourceKind kind = getKind(); | ||
| final int prime = 31; | ||
| return prime * (namespace.hashCode() + name.hashCode() + kind.hashCode()); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object obj) { | ||
| if (this == obj) | ||
| return true; | ||
| else if (obj == null) | ||
| return false; | ||
| else if (getClass() != obj.getClass()) | ||
| return false; | ||
| else { | ||
| KubernetesResource other = (KubernetesResource) obj; | ||
| if (getKind() != null){ | ||
| if (getKind() != other.getKind()) { | ||
| return false; | ||
| } | ||
| } else { | ||
| if (other.getKind() != null) { | ||
| return false; | ||
| } | ||
| } | ||
| if (getNamespace() != null) { | ||
| if(!getNamespace().equals(other.getNamespace())) { | ||
| return false; | ||
| } | ||
| } else { | ||
| if (other.getNamespace() != null) { | ||
| return false; | ||
| } | ||
| } | ||
| if (getName() != null) { | ||
| if(!getName().equals(other.getName())) { | ||
| return false; | ||
| } | ||
| } else { | ||
| if (other.getName() != null) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| } | ||
| return true; | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this will throw for unknown/new kinds that we are not aware of. We should either get away from enums or provide a lenient #valueOf
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@adietish this was one of my thoughts to KubernetesResource not being abstract for the cases of when we do have kinds we dont understand about and we decide to move away from enum