Eliminate some IDE warnings (cosmetic changes)

Evolveum · Jun 7, 2019 · 4e45de4 · 4e45de4
1 parent 41a4aa5
commit 4e45de4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 33 deletions.
diff --git a/.../main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java b/.../main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
@@ -61,12 +61,12 @@ static <T> LayerRefinedAttributeDefinition<T> wrap(RefinedAttributeDefinition<T>
 
 	static List<LayerRefinedAttributeDefinition<?>> wrapCollection(
 			Collection<? extends ItemDefinition> defs, LayerType layer) {
-		List outs = new ArrayList<LayerRefinedAttributeDefinition<?>>(defs.size());
+		List<LayerRefinedAttributeDefinition<?>> outs = new ArrayList<>(defs.size());
 		for (ItemDefinition itemDef: defs) {
             if (itemDef instanceof LayerRefinedAttributeDefinition) {
-                outs.add(itemDef);
+                outs.add(((LayerRefinedAttributeDefinition<?>) itemDef));
             } else if (itemDef instanceof RefinedAttributeDefinition) {
-                outs.add(wrap((RefinedAttributeDefinition)itemDef, layer));
+                outs.add(wrap((RefinedAttributeDefinition<?>) itemDef, layer));
             } else {
                 throw new IllegalStateException("Unexpected type of attribute definition: " + itemDef);
             }
@@ -168,26 +168,6 @@ public boolean canModify() {
 		return refinedAttributeDefinition.canModify(layer);
 	}
 
-//	@Override
-	public void setCanRead(boolean val) {
-		throw new UnsupportedOperationException("read only");
-	}
-
-	//@Override
-	public void setCanModify(boolean val) {
-		throw new UnsupportedOperationException("read only");
-	}
-
-	//@Override
-	public void setCanAdd(boolean val) {
-		throw new UnsupportedOperationException("read only");
-	}
-
-	//	@Override
-//	public boolean isValidFor(QName elementQName, Class clazz) {
-//		return isValidFor(elementQName, clazz, false);
-//	}
-
 	@Override
 	public int hashCode() {
 		final int prime = 31;
@@ -197,6 +177,7 @@ public int hashCode() {
 		return result;
 	}
 
+	@SuppressWarnings("RedundantIfStatement")
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)
@@ -260,7 +241,7 @@ public Boolean getReadReplaceMode() {
 	}
 
 	@Override
-	public <T extends ItemDefinition> T findItemDefinition(@NotNull ItemPath path, @NotNull Class<T> clazz) {
+	public <DT extends ItemDefinition> DT findItemDefinition(@NotNull ItemPath path, @NotNull Class<DT> clazz) {
 		return refinedAttributeDefinition.findItemDefinition(path, clazz);
 	}
 
@@ -544,7 +525,7 @@ public Boolean isIndexed() {
 	public boolean canAdd(LayerType layer) {
 		if (this.layer == layer) { 
 			if (overrideCanAdd != null) {
-				return overrideCanAdd.booleanValue();
+				return overrideCanAdd;
 			}
 		}
 		return refinedAttributeDefinition.canAdd(layer);
@@ -584,7 +565,7 @@ public boolean isOptional() {
 	public boolean canRead(LayerType layer) {
 		if (this.layer == layer) { 
 			if (overrideCanRead != null) {
-				return overrideCanRead.booleanValue();
+				return overrideCanRead;
 			}
 		}
 		return refinedAttributeDefinition.canRead(layer);
@@ -629,7 +610,7 @@ public PropertyDelta<T> createEmptyDelta(ItemPath path) {
 	public boolean canModify(LayerType layer) {
 		if (this.layer == layer) { 
 			if (overrideCanModify != null) {
-				return overrideCanModify.booleanValue();
+				return overrideCanModify;
 			}
 		}
 		return refinedAttributeDefinition.canModify(layer);
@@ -694,7 +675,7 @@ public <A> void setAnnotation(QName qname, A value) {
 
 	@Override
 	public String toString() {
-		return String.valueOf(refinedAttributeDefinition) + ":" + layer;
+		return refinedAttributeDefinition + ":" + layer;
 	}
 
 }
diff --git a/...ain/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java b/...ain/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
@@ -247,15 +247,16 @@ public ResourceAttributeContainer instantiate(QName name) {
 	public <X> LayerRefinedAttributeDefinition<X> findAttributeDefinition(@NotNull QName elementQName) {
         for (LayerRefinedAttributeDefinition definition : getAttributeDefinitions()) {
             if (QNameUtil.match(definition.getName(), elementQName)) {
-                return definition;
+	            //noinspection unchecked
+	            return definition;
             }
         }
         return null;
 	}
 
     @Override
-	public LayerRefinedAttributeDefinition<?> findAttributeDefinition(String elementLocalname) {
-    	return LayerRefinedAttributeDefinitionImpl.wrap(refinedObjectClassDefinition.findAttributeDefinition(elementLocalname), layer);
+	public <X> LayerRefinedAttributeDefinition<X> findAttributeDefinition(String elementLocalName) {
+    	return LayerRefinedAttributeDefinitionImpl.wrap(refinedObjectClassDefinition.findAttributeDefinition(elementLocalName), layer);
 	}
 
     @Override
@@ -309,7 +310,7 @@ public PrismObjectDefinition<ShadowType> getObjectDefinition() {
 	}
 
     @Override
-	public boolean containsAttributeDefinition(QName attributeName) {
+	public boolean containsAttributeDefinition(@NotNull QName attributeName) {
 		return refinedObjectClassDefinition.containsAttributeDefinition(attributeName);
 	}
 
@@ -446,7 +447,7 @@ public AttributeFetchStrategyType getActivationFetchStrategy(QName propertyName)
 
 	@Override
 	public <T extends CapabilityType> T getEffectiveCapability(Class<T> capabilityClass, ResourceType resourceType) {
-		return (T) refinedObjectClassDefinition.getEffectiveCapability(capabilityClass, resourceType);
+		return refinedObjectClassDefinition.getEffectiveCapability(capabilityClass, resourceType);
 	}
 
 	@Override
@@ -515,12 +516,14 @@ public <ID extends ItemDefinition> ID findLocalItemDefinition(@NotNull QName nam
 		if (layerRefinedAttributeDefinitions != null) {
 			for (LayerRefinedAttributeDefinition attrDef : layerRefinedAttributeDefinitions) {
 				if (attrDef.isValidFor(name, clazz, caseInsensitive)) {
+					//noinspection unchecked
 					return (ID) attrDef;
 				}
 			}
 		}
 
 		ID def = refinedObjectClassDefinition.findLocalItemDefinition(name, clazz, caseInsensitive);
+		//noinspection unchecked
 		return (ID) LayerRefinedAttributeDefinitionImpl.wrap((RefinedAttributeDefinition) def, layer);
 	}
 
@@ -548,6 +551,7 @@ public int hashCode() {
 		return result;
 	}
 
+	@SuppressWarnings("RedundantIfStatement")
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)