From 85742f3936eb67a025da325c44d5f80568e56557 Mon Sep 17 00:00:00 2001 From: Benjamin Culkin Date: Mon, 1 Jul 2024 17:34:09 -0400 Subject: Cleanup --- .../src/main/java/net/israfil/foundation/dynamic/DynamicObject.java | 6 ++++-- .../src/main/java/net/israfil/foundation/dynamic/DynamicUtil.java | 6 +++--- .../net/israfil/foundation/dynamic/DynamicallyAccessibleObject.java | 3 +++ .../net/israfil/foundation/dynamic/DynamicallyMutableObject.java | 4 ++++ 4 files changed, 14 insertions(+), 5 deletions(-) (limited to 'israfil-foundation-dynamic/src') diff --git a/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicObject.java b/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicObject.java index 3beda20..4c40948 100644 --- a/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicObject.java +++ b/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicObject.java @@ -50,14 +50,16 @@ public abstract class DynamicObject implements Dynamic { /** * @see org.israfil.maveric.Dynamic#perform(java.lang.String, java.lang.Object[]) */ - public Object perform(String selector, Object ... parameters) { + @Override + public Object perform(String selector, Object ... parameters) { return DynamicUtil.performOn(this,selector,parameters); } /** * @see org.israfil.maveric.Dynamic#respondsTo(java.lang.String) */ - public boolean respondsTo(String selector) { + @Override + public boolean respondsTo(String selector) { return DynamicUtil.respondsTo(this,selector); } diff --git a/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicUtil.java b/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicUtil.java index 9c165bc..e0da9ba 100644 --- a/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicUtil.java +++ b/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicUtil.java @@ -58,9 +58,9 @@ public final class DynamicUtil { private DynamicUtil() {} - static Map> _primitiveTypes = new HashMap>(); - static Map, Class> _primitiveTypeEquivalents = new HashMap, Class>(); - static Map, Class> _boxedTypeEquivalents = new HashMap, Class>(); + static Map> _primitiveTypes = new HashMap<>(); + static Map, Class> _primitiveTypeEquivalents = new HashMap<>(); + static Map, Class> _boxedTypeEquivalents = new HashMap<>(); static { _primitiveTypes.put("boolean",boolean.class); _primitiveTypeEquivalents.put(Boolean.class,boolean.class); diff --git a/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicallyAccessibleObject.java b/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicallyAccessibleObject.java index fd376a7..6e5b9b9 100644 --- a/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicallyAccessibleObject.java +++ b/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicallyAccessibleObject.java @@ -50,6 +50,7 @@ import net.israfil.foundation.core.Strings; public abstract class DynamicallyAccessibleObject extends DynamicObject implements DynamicallyAccessible { private static Logger logger = Logger.getLogger(DynamicallyAccessibleObject.class.getName()); + @Override public Object get(String attributeName) { return get(this,attributeName); } @@ -94,6 +95,7 @@ public abstract class DynamicallyAccessibleObject extends DynamicObject implemen * * The existing implementation is inefficient, but simple to maintain. */ + @Override public boolean hasAttribute(String attributeName) { return hasAttribute(this,attributeName); } @@ -128,6 +130,7 @@ public abstract class DynamicallyAccessibleObject extends DynamicObject implemen return null; } + @Override public boolean hasAccessor(String attributeName) { return hasAccessor(this,attributeName); } diff --git a/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicallyMutableObject.java b/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicallyMutableObject.java index 63b301d..a27811a 100644 --- a/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicallyMutableObject.java +++ b/israfil-foundation-dynamic/src/main/java/net/israfil/foundation/dynamic/DynamicallyMutableObject.java @@ -53,6 +53,7 @@ public abstract class DynamicallyMutableObject extends DynamicallyAccessibleObje private static Logger logger = Logger.getLogger(DynamicallyMutableObject.class.getName()); + @Override public void setNull(String attributeName, Class valueType) { setNull(this,attributeName,valueType); } @@ -62,6 +63,7 @@ public abstract class DynamicallyMutableObject extends DynamicallyAccessibleObje set(target,attributeName, null, valueType); } + @Override public void set(String attributeName,Object value) { set(this,attributeName,value); } @@ -70,6 +72,7 @@ public abstract class DynamicallyMutableObject extends DynamicallyAccessibleObje else set(target,attributeName, value, value.getClass()); } + @Override public void set(String attributeName, Object value, Class valueType) { set(this,attributeName,value,valueType); } @@ -187,6 +190,7 @@ public abstract class DynamicallyMutableObject extends DynamicallyAccessibleObje } } + @Override public boolean hasMutator(String attributeName, Class type) { return hasMutator(this,attributeName,type); } -- cgit v1.2.3