From 03e868508b52c1e59bdba364deccf69679307b01 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Tue, 16 May 2017 17:49:19 +0200 Subject: [PATCH] yang-jmx-generator: use lambdas This series of patches uses lambdas instead of anonymous classes for functional interfaces when possible. Lambdas are replaced with method references when appropriate. Change-Id: Ica1ba9d37edbd25421b8fabac5cb1567608e1fb6 Signed-off-by: Stephen Kitt --- .../yangjmxgenerator/RuntimeBeanEntry.java | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntry.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntry.java index 34e3c2e071..d94c695106 100644 --- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntry.java +++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntry.java @@ -64,19 +64,8 @@ import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; */ public class RuntimeBeanEntry { - private static final Function QNAME_FROM_NODE = new Function() { - @Override - public QName apply(final SchemaNode input) { - return input.getQName(); - } - }; - - private static final Function UNKNOWN_NODE_TO_STRING = new Function() { - @Override - public String apply(final UnknownSchemaNode input) { - return input.getQName().getLocalName() + input.getNodeParameter(); - } - }; + private static final Function UNKNOWN_NODE_TO_STRING = + input -> input.getQName().getLocalName() + input.getNodeParameter(); private final String packageName; private final String yangName, javaNamePrefix; @@ -175,7 +164,8 @@ public class RuntimeBeanEntry { for (Module currentModule : schemaCtx.getModules()) { // Find all identities in current module for later identity->rpc mapping - Set allIdentitiesInModule = Sets.newHashSet(Collections2.transform(currentModule.getIdentities(), QNAME_FROM_NODE)); + Set allIdentitiesInModule = + Sets.newHashSet(Collections2.transform(currentModule.getIdentities(), SchemaNode::getQName)); for (RpcDefinition rpc : currentModule.getRpcs()) { ContainerSchemaNode input = rpc.getInput(); @@ -348,12 +338,8 @@ public class RuntimeBeanEntry { } private static Collection sortAttributes(final Collection childNodes) { - final TreeSet dataSchemaNodes = new TreeSet<>(new Comparator() { - @Override - public int compare(final DataSchemaNode o1, final DataSchemaNode o2) { - return o1.getQName().getLocalName().compareTo(o2.getQName().getLocalName()); - } - }); + final TreeSet dataSchemaNodes = + new TreeSet<>(Comparator.comparing(o -> o.getQName().getLocalName())); dataSchemaNodes.addAll(childNodes); return dataSchemaNodes; } -- 2.36.6