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%2FField.java;h=c08a440f7fe303bd5fed16780b3ac88da7a2481d;hb=d3d5d329914eddb066680f7e22ce5dd7c09616e7;hp=ad5cbb287c73a4aef2cafebce6afb442f57fd1ed;hpb=065ef4acddbae75329e75562c533120d2d615efe;p=controller.git

diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/Field.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/Field.java
index ad5cbb287c..c08a440f7f 100644
--- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/Field.java
+++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/Field.java
@@ -7,45 +7,47 @@
  */
 package org.opendaylight.controller.config.yangjmxgenerator.plugin.ftl.model;
 
-import com.google.common.collect.Lists;
+import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.util.ArrayList;
 import java.util.List;
+import javax.lang.model.element.Modifier;
 
 public class Field {
     private final String type;
     private final String name;
     private final String definition;
-    private final List<String> modifiers;
+    private final List<Modifier> modifiers;
     private final boolean needsDepResolver;
 
     public Field(String type, String name) {
-        this(Lists.<String> newArrayList(), type, name, null, false);
+        this(new ArrayList<>(), type, name, null, false);
     }
 
     public Field(String type, String name, String definition) {
-        this(Lists.<String> newArrayList(), type, name, definition, false);
+        this(new ArrayList<>(), type, name, definition, false);
     }
 
-    public Field(List<String> modifiers, String type, String name) {
+    public Field(List<Modifier> modifiers, String type, String name) {
         this(modifiers, type, name, null, false);
     }
 
-    public Field(List<String> modifiers, String type, String name,
+    public Field(List<Modifier> modifiers, String type, String name,
             String definition) {
         this(modifiers, type, name, definition, false);
     }
 
-    public Field(List<String> modifiers, String type, String name,
-            String definition, boolean needsDepResolver) {
-        this.modifiers = modifiers;
-        this.type = type;
-        this.name = name;
-        this.definition = definition;
+    public Field(List<Modifier> modifiers, String type, String name,
+            String nullableDefinition, boolean needsDepResolver) {
+        this.modifiers = checkNotNull(modifiers);
+        this.type = checkNotNull(type);
+        this.name = checkNotNull(name);
+        this.definition = nullableDefinition;
         this.needsDepResolver = needsDepResolver;
     }
 
     public Field(String type, String name, String definition, boolean needsDepResolver) {
-        this(Lists.<String> newArrayList(), type, name, definition, needsDepResolver);
+        this(new ArrayList<>(), type, name, definition, needsDepResolver);
     }
 
     public boolean isNeedsDepResolver() {
@@ -56,7 +58,11 @@ public class Field {
         return type;
     }
 
-    public List<String> getModifiers() {
+    public String getGenericInnerType() {
+        return type.substring(type.indexOf("<") + 1, type.indexOf(">"));
+    }
+
+    public List<Modifier> getModifiers() {
         return modifiers;
     }
 
@@ -71,4 +77,9 @@ public class Field {
     public boolean isArray() {
         return type.endsWith("[]");
     }
+
+    @Override
+    public String toString() {
+        return FieldSerializer.toString(this);
+    }
 }