From cae21c361e5703544b4822ae0e83456fb336835c Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Wed, 9 Mar 2016 12:12:44 +0100 Subject: [PATCH] Use the diamond operator in generated Java Now that javaparser is used to verify the generated code, use <>. Change-Id: I9ef5ad62108b91eba8565329386f96c777b03cdf Signed-off-by: Stephen Kitt --- .../plugin/gofactory/AbsFactoryGeneratedObjectFactory.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/gofactory/AbsFactoryGeneratedObjectFactory.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/gofactory/AbsFactoryGeneratedObjectFactory.java index 3ee43a6ba8..e7a7d2147e 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/gofactory/AbsFactoryGeneratedObjectFactory.java +++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/gofactory/AbsFactoryGeneratedObjectFactory.java @@ -129,11 +129,10 @@ public class AbsFactoryGeneratedObjectFactory { "throw new UnsupportedOperationException(\"Class reloading is not supported\");\n"+ "}\n", moduleFQN, DynamicMBeanWithInstance.class.getCanonicalName())); - // TODO The generic specifier in HashSet<> isn't necessary, but the Eclipse AST parser used in the unit tests doesn't support this b.addToBody(format("\n"+ "@Override\n"+ "public java.util.Set<%s> getDefaultModules(org.opendaylight.controller.config.api.DependencyResolverFactory dependencyResolverFactory, %s bundleContext) {\n"+ - "return new java.util.HashSet<%1$s>();\n"+ + "return new java.util.HashSet<>();\n"+ "}\n", moduleFQN, BUNDLE_CONTEXT)); return new GeneratedObjectBuilder(b.build()).toGeneratedObject(); @@ -177,8 +176,7 @@ public class AbsFactoryGeneratedObjectFactory { String result = "static {\n"; if (!providedServices.isEmpty()) { - // TODO The generic specifier in HashSet<> isn't necessary, but the Eclipse AST parser used in the unit tests doesn't support this - result += format("java.util.Set<%1$s> serviceIfcs2 = new java.util.HashSet<%1$s>();\n", generic); + result += format("java.util.Set<%1$s> serviceIfcs2 = new java.util.HashSet<>();\n", generic); for(FullyQualifiedName fqn: providedServices) { result += format("serviceIfcs2.add(%s.class);\n", fqn); -- 2.36.6