Fixed the missing Javadoc Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/2405f81c Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/2405f81c Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/2405f81c
Branch: refs/heads/2.0 Commit: 2405f81cb15ef25f3404496fcf05bcdd4675a06a Parents: 0562fd4 Author: Emmanuel Lécharny <elecha...@symas.com> Authored: Sun Dec 4 10:06:55 2016 +0100 Committer: Emmanuel Lécharny <elecha...@symas.com> Committed: Sun Dec 4 10:06:55 2016 +0100 ---------------------------------------------------------------------- .../ognl/AbstractPropertyAccessor.java | 24 ---------------- .../mina/integration/ognl/IoSessionFinder.java | 29 ++++++++++---------- .../ognl/IoSessionPropertyAccessor.java | 2 +- .../integration/ognl/PropertyTypeConverter.java | 7 +++-- 4 files changed, 20 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/2405f81c/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/AbstractPropertyAccessor.java ---------------------------------------------------------------------- diff --git a/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/AbstractPropertyAccessor.java b/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/AbstractPropertyAccessor.java index 313e0a6..518ef92 100644 --- a/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/AbstractPropertyAccessor.java +++ b/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/AbstractPropertyAccessor.java @@ -29,7 +29,6 @@ import ognl.PropertyAccessor; * * @author <a href="http://mina.apache.org">Apache MINA Project</a> */ -@SuppressWarnings("unchecked") public abstract class AbstractPropertyAccessor extends ObjectPropertyAccessor { static final Object READ_ONLY_MODE = new Object(); @@ -97,27 +96,4 @@ public abstract class AbstractPropertyAccessor extends ObjectPropertyAccessor { protected abstract Object setProperty0(OgnlContext context, Object target, String name, Object value) throws OgnlException; - - // The following methods uses the four method above, so there's no need - // to override them. - - @Override - public final Object getProperty(Map context, Object target, Object oname) throws OgnlException { - return super.getProperty(context, target, oname); - } - - @Override - public final boolean hasGetProperty(Map context, Object target, Object oname) throws OgnlException { - return super.hasGetProperty(context, target, oname); - } - - @Override - public final boolean hasSetProperty(Map context, Object target, Object oname) throws OgnlException { - return super.hasSetProperty(context, target, oname); - } - - @Override - public final void setProperty(Map context, Object target, Object oname, Object value) throws OgnlException { - super.setProperty(context, target, oname, value); - } } http://git-wip-us.apache.org/repos/asf/mina/blob/2405f81c/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java ---------------------------------------------------------------------- diff --git a/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java b/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java index 28fd9c3..7f95bc3 100644 --- a/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java +++ b/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java @@ -60,17 +60,17 @@ public class IoSessionFinder { int comp = -1; for (int i=0; i<query.length();i++) { - char c = query.charAt(i); - - if ((c == '=') || (c == '<') || (c == '>') || (c == '!')) { - comp = i; - } else if ( !Character.isJavaIdentifierPart(c) && (c != ' ')) { + char c = query.charAt(i); + + if ((c == '=') || (c == '<') || (c == '>') || (c == '!')) { + comp = i; + } else if ( !Character.isJavaIdentifierPart(c) && (c != ' ')) { throw new IllegalArgumentException("Invalid query."); - } else { - if ( comp > 0) { - break; - } - } + } else { + if ( comp > 0) { + break; + } + } } if (comp<=0) { @@ -78,11 +78,11 @@ public class IoSessionFinder { } for (int i=comp+1; i<query.length();i++) { - char c = query.charAt(i); + char c = query.charAt(i); - if (!Character.isJavaIdentifierPart(c) && (c != ' ') && (c != '"') && (c != '\'')) { + if (!Character.isJavaIdentifierPart(c) && (c != ' ') && (c != '"') && (c != '\'')) { throw new IllegalArgumentException("Invalid query."); - } + } } this.query = query; @@ -97,7 +97,6 @@ public class IoSessionFinder { /** * Finds a {@link Set} of {@link IoSession}s that matches the query * from the specified sessions and returns the matches. - * @throws OgnlException if failed to evaluate the OGNL expression * * @param sessions The list of sessions to check * @return A set of the session that matches the query @@ -108,7 +107,7 @@ public class IoSessionFinder { throw new IllegalArgumentException("sessions"); } - Set<IoSession> answer = new LinkedHashSet<IoSession>(); + Set<IoSession> answer = new LinkedHashSet<>(); for (IoSession s : sessions) { OgnlContext context = (OgnlContext) Ognl.createDefaultContext(s); http://git-wip-us.apache.org/repos/asf/mina/blob/2405f81c/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionPropertyAccessor.java ---------------------------------------------------------------------- diff --git a/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionPropertyAccessor.java b/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionPropertyAccessor.java index b728baa..c009fba 100644 --- a/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionPropertyAccessor.java +++ b/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionPropertyAccessor.java @@ -36,7 +36,7 @@ public class IoSessionPropertyAccessor extends AbstractPropertyAccessor { @Override protected Object getProperty0(OgnlContext context, Object target, String name) throws OgnlException { if (target instanceof IoSession && "attributes".equals(name)) { - Map<String, Object> attributes = new TreeMap<String, Object>(); + Map<String, Object> attributes = new TreeMap<>(); IoSession s = (IoSession) target; for (Object key : s.getAttributeKeys()) { Object value = s.getAttribute(key); http://git-wip-us.apache.org/repos/asf/mina/blob/2405f81c/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/PropertyTypeConverter.java ---------------------------------------------------------------------- diff --git a/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/PropertyTypeConverter.java b/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/PropertyTypeConverter.java index c4c927a..b98e4c9 100644 --- a/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/PropertyTypeConverter.java +++ b/mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/PropertyTypeConverter.java @@ -34,14 +34,17 @@ import org.apache.mina.integration.beans.PropertyEditorFactory; * OgnlContext ctx = Ognl.createDefaultContext(root); * ctx.put(OgnlContext.TYPE_CONVERTER_CONTEXT_KEY, new PropertyTypeConverter()); * </code></pre> - * You can also override {@link #getPropertyEditor(Class, String, Class)} + * You can also override getPropertyEditor(Class, String, Class) * method to have more control over how an appropriate {@link PropertyEditor} * is chosen. * * @author <a href="http://mina.apache.org">Apache MINA Project</a> */ public class PropertyTypeConverter implements TypeConverter { - + /** + * {@inheritDoc} + */ + @Override @SuppressWarnings("unchecked") public Object convertValue(Map ctx, Object target, Member member, String attrName, Object value, Class toType) { if (value == null) {