X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fyang-jmx-generator-plugin%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyangjmxgenerator%2Fplugin%2Fftl%2Fmodel%2FModuleField.java;h=aff7af2811f061ba762d4789e088b4fb3c0c41f1;hb=0563e3f9bbfc5c8fdcb910046738534126901e9a;hp=293696d10e0887e3157412d9653bc87878791ef8;hpb=9fb64948564e252018f9b1e13e7cea2c92f991aa;p=controller.git diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/ModuleField.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/ModuleField.java index 293696d10e..aff7af2811 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/ModuleField.java +++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/ModuleField.java @@ -7,31 +7,38 @@ */ package org.opendaylight.controller.config.yangjmxgenerator.plugin.ftl.model; + +import org.opendaylight.controller.config.yangjmxgenerator.attribute.Dependency; + +import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.DependencyAttribute.Dependency; - public class ModuleField extends Field { private final String nullableDefault, attributeName; - private final boolean dependent; + private final boolean dependent, isListOfDependencies; private final Dependency dependency; - public ModuleField(List modifiers, String type, String name, + private ModuleField(List modifiers, String type, String name, String attributeName, String nullableDefault, boolean isDependency, - Dependency dependency) { + Dependency dependency, boolean isListOfDependencies) { super(modifiers, type, name); - this.nullableDefault = nullableDefault; this.dependent = isDependency; this.dependency = dependency; this.attributeName = attributeName; + if (type.startsWith(List.class.getName()) && nullableDefault == null) { + String generics = type.substring(List.class.getName().length()); + nullableDefault = "new " + ArrayList.class.getName() + generics + "()"; + } + this.nullableDefault = nullableDefault; + this.isListOfDependencies = isListOfDependencies; } public ModuleField(String type, String name, String attributeName, - String nullableDefault, boolean isDependency, Dependency dependency) { + String nullableDefault, boolean isDependency, Dependency dependency, boolean isListOfDependencies) { this(Collections. emptyList(), type, name, attributeName, - nullableDefault, isDependency, dependency); + nullableDefault, isDependency, dependency, isListOfDependencies); } public Dependency getDependency() { @@ -46,7 +53,12 @@ public class ModuleField extends Field { return dependent; } + public boolean isListOfDependencies() { + return isListOfDependencies; + } + public String getAttributeName() { return attributeName; } + }