From c5c8f4e9dff4a07d17ee7517d32390f9fc9ddd8f Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Sun, 14 Dec 2014 11:29:16 -0500 Subject: [PATCH] Fix checkstyle if-statements must use braces northbound/commons Change-Id: Iadad636ebf07e8c31a8c85540f10180b825c8a4a Signed-off-by: Thanh Ha --- .../commons/query/IteratableTypeInfo.java | 8 +++- .../commons/query/QueryContextImpl.java | 16 +++++-- .../northbound/commons/query/QueryImpl.java | 8 +++- .../northbound/commons/query/TypeInfo.java | 44 ++++++++++++++----- .../commons/query/WrapperTypeInfo.java | 12 +++-- 5 files changed, 66 insertions(+), 22 deletions(-) diff --git a/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/IteratableTypeInfo.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/IteratableTypeInfo.java index 3977837c7f..d0386ed2c5 100644 --- a/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/IteratableTypeInfo.java +++ b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/IteratableTypeInfo.java @@ -29,7 +29,9 @@ import java.util.List; Object item = it.next(); for (TypeInfo child : _types.values()) { Object val = child.retrieve(item, query, index); - if (val != null) objects.add(val); + if (val != null) { + objects.add(val); + } } } return objects; @@ -38,7 +40,9 @@ import java.util.List; @Override public synchronized void explore() { - if (_explored) return; + if (_explored) { + return; + } if (LOGGER.isDebugEnabled()) { LOGGER.debug("exploring iteratable type: {} gtype: {}", _class, _accessor.getGenericType()); diff --git a/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContextImpl.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContextImpl.java index 13d70b1cb0..8f83c147c8 100644 --- a/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContextImpl.java +++ b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContextImpl.java @@ -16,17 +16,25 @@ import org.slf4j.LoggerFactory; @Override public Query createQuery(String queryString, Class type) throws QueryException { - if (queryString == null || queryString.trim().length() == 0) return null; + if (queryString == null || queryString.trim().length() == 0) { + return null; + } try { - if (LOGGER.isDebugEnabled()) LOGGER.debug("Processing query: {}", queryString); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Processing query: {}", queryString); + } // FiqlParser is a parser generated by javacc Expression expression = FiqlParser.parse(queryString); - if (LOGGER.isDebugEnabled()) LOGGER.debug("Query expression: {}", expression); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Query expression: {}", expression); + } // create Query and return; return new QueryImpl(type, expression); } catch (Exception ex) { - if (LOGGER.isDebugEnabled()) LOGGER.error("Query processing failed = {}", + if (LOGGER.isDebugEnabled()) { + LOGGER.error("Query processing failed = {}", queryString, ex); + } throw new QueryException("Unable to parse query.", ex); } } diff --git a/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryImpl.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryImpl.java index a520f98fc0..cb77e04a59 100644 --- a/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryImpl.java +++ b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryImpl.java @@ -158,7 +158,9 @@ import org.slf4j.LoggerFactory; } private boolean compare(Object valueToMatch, Object actualValue, OP operator) { - if (valueToMatch == null || actualValue == null) return false; + if (valueToMatch == null || actualValue == null) { + return false; + } if (ALLOW_OBJECT_STRING_COMPARE && (valueToMatch instanceof String) && !(actualValue instanceof String)) { actualValue = actualValue.toString(); @@ -203,7 +205,9 @@ import org.slf4j.LoggerFactory; } } private Object parse(String arg, Object value) { - if (value == null) return null; + if (value == null) { + return null; + } try { if (value instanceof String) { diff --git a/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/TypeInfo.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/TypeInfo.java index 91f01d8ad7..6c0c5dc816 100644 --- a/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/TypeInfo.java +++ b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/TypeInfo.java @@ -107,7 +107,9 @@ import org.slf4j.LoggerFactory; if (LOGGER.isDebugEnabled()) { LOGGER.debug("retrieve: {}/{} type:{}", index, query.length, target.getClass()); } - if (index >= query.length) return null; + if (index >= query.length) { + return null; + } explore(); if (!target.getClass().equals(_class)) { if (_class.isAssignableFrom(target.getClass())) { @@ -124,7 +126,9 @@ import org.slf4j.LoggerFactory; } } TypeInfo child = getChild(query[index]); - if (child == null) return null; + if (child == null) { + return null; + } target = child.getAccessor().getValue(target); if (index+1 == query.length) { // match found @@ -137,27 +141,35 @@ import org.slf4j.LoggerFactory; * Explore the type info for children. */ public synchronized void explore() { - if (_explored) return; + if (_explored) { + return; + } for (Class c = _class; c != null; c = c.getSuperclass()) { - if (c.equals(Object.class)) break; + if (c.equals(Object.class)) { + break; + } // Currently only fields and methods annotated with JAXB annotations are // considered as valid for search purposes. //check methods first for (Method m : c.getDeclaredMethods()) { String tn = getTypeName(m, _accessType); if (tn != null) { - if (LOGGER.isDebugEnabled()) LOGGER.debug( + if (LOGGER.isDebugEnabled()) { + LOGGER.debug( "exploring type: {} name: {} method: {}", _class.getSimpleName(), tn, m); + } _types.put(tn, createTypeInfo(tn, new Accessor(m))); } } for (Field f : c.getDeclaredFields()) { String tn = getTypeName(f, _accessType); if (tn != null) { - if (LOGGER.isDebugEnabled()) LOGGER.debug( + if (LOGGER.isDebugEnabled()) { + LOGGER.debug( "exploring type: {} name: {} field: {}", _class.getSimpleName(), tn, f); + } _types.put(tn, createTypeInfo(tn, new Accessor(f))); } } @@ -219,7 +231,9 @@ import org.slf4j.LoggerFactory; PropertyDescriptor[] props = info.getPropertyDescriptors(); for (PropertyDescriptor pd : props) { - if (m.equals(pd.getReadMethod())) return pd.getName(); + if (m.equals(pd.getReadMethod())) { + return pd.getName(); + } } } catch (IntrospectionException e) @@ -234,8 +248,12 @@ import org.slf4j.LoggerFactory; // root is always a composite type // FIXME assert its a JAXB type XmlRootElement root = clz.getAnnotation(XmlRootElement.class); - if (root == null) throw new IllegalArgumentException("Not a JAXB type: " + clz); - if (name == null) name = getRootName(clz); + if (root == null) { + throw new IllegalArgumentException("Not a JAXB type: " + clz); + } + if (name == null) { + name = getRootName(clz); + } return new TypeInfo(name, clz, null); } @@ -252,7 +270,9 @@ import org.slf4j.LoggerFactory; public static String getRootName(Class cls) { XmlRootElement root = cls.getAnnotation(XmlRootElement.class); - if (root == null) return null; + if (root == null) { + return null; + } String rootName = root.name(); if (DEFAULT_NAME.equals(rootName)) { String clsName = cls.getSimpleName(); @@ -281,7 +301,9 @@ import org.slf4j.LoggerFactory; return null; } } - if (DEFAULT_NAME.equals(name)) return dflt; + if (DEFAULT_NAME.equals(name)) { + return dflt; + } return name; } diff --git a/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/WrapperTypeInfo.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/WrapperTypeInfo.java index a8172f2add..156942c61d 100644 --- a/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/WrapperTypeInfo.java +++ b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/WrapperTypeInfo.java @@ -24,10 +24,14 @@ public class WrapperTypeInfo extends TypeInfo { if (LOGGER.isDebugEnabled()) { LOGGER.debug("retrieve collection: {}/{}", index, query.length); } - if (index >= query.length) return null; + if (index >= query.length) { + return null; + } explore(); TypeInfo child = getChild(query[index]); - if (child == null) return null; + if (child == null) { + return null; + } if (query.length == index+1) { // skipping this node return target; }else { // if list of list go to next node to get value @@ -37,7 +41,9 @@ public class WrapperTypeInfo extends TypeInfo { @Override public synchronized void explore() { - if (_explored) return; + if (_explored) { + return; + } if (LOGGER.isDebugEnabled()) { LOGGER.debug("exploring wrapper type: {} gtype: {}", _class, _accessor.getGenericType()); -- 2.36.6