X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fyang-model-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fyang%2Fparser%2Fbuilder%2Fimpl%2FUnionTypeBuilder.java;h=07db69901fe485a4eb1066a4882e150c2d79c089;hb=5cb959c28b66deaab914e168a8f0bf65612f70b5;hp=811b77566836b0f95ad9844562117bc239b569a1;hpb=626c9943156ed658f0a4cf11858ccc19b9c316cf;p=controller.git

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UnionTypeBuilder.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UnionTypeBuilder.java
index 811b775668..07db69901f 100644
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UnionTypeBuilder.java
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UnionTypeBuilder.java
@@ -7,10 +7,8 @@
  */
 package org.opendaylight.controller.yang.parser.builder.impl;
 
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
@@ -31,30 +29,22 @@ import org.opendaylight.controller.yang.parser.util.YangParseException;
  * When build is called, types in builder form will be built and add to resolved
  * types.
  */
-public class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
+public final class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
         TypeDefinitionBuilder {
     private final static String NAME = "union";
 
     private final int line;
     private final List<TypeDefinition<?>> types;
     private final List<TypeDefinitionBuilder> typedefs;
-    private final UnionType instance;
-    private boolean built;
+    private UnionType instance;
+    private boolean isBuilt;
 
-    private final List<String> actualPath;
-    private final URI namespace;
-    private final Date revision;
+    private SchemaPath path;
 
-    public UnionTypeBuilder(final List<String> actualPath, final URI namespace,
-            final Date revision, final int line) {
+    public UnionTypeBuilder(final int line) {
         this.line = line;
         types = new ArrayList<TypeDefinition<?>>();
         typedefs = new ArrayList<TypeDefinitionBuilder>();
-        instance = new UnionType(actualPath, namespace, revision, types);
-
-        this.actualPath = actualPath;
-        this.namespace = namespace;
-        this.revision = revision;
     }
 
     @Override
@@ -86,26 +76,25 @@ public class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
     }
 
     @Override
-    public void setType(final TypeDefinitionBuilder tdb) {
+    public void setTypedef(final TypeDefinitionBuilder tdb) {
         typedefs.add(tdb);
     }
 
     @Override
     public UnionType build() {
-        if (built) {
-            return instance;
-        } else {
+        if (!isBuilt) {
+            instance = new UnionType(path, types);
             for (TypeDefinitionBuilder tdb : typedefs) {
                 types.add(tdb.build());
             }
-            built = true;
-            return instance;
+            isBuilt = true;
         }
+        return instance;
     }
 
     @Override
     public void setPath(final SchemaPath schemaPath) {
-        throw new YangParseException(line, "Can not set path to " + NAME);
+        this.path = schemaPath;
     }
 
     @Override
@@ -136,7 +125,7 @@ public class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
 
     @Override
     public SchemaPath getPath() {
-        return null;
+        return path;
     }
 
     @Override
@@ -221,18 +210,6 @@ public class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
         throw new YangParseException(line, "Can not set units to " + NAME);
     }
 
-    public List<String> getActualPath() {
-        return actualPath;
-    }
-
-    public URI getNamespace() {
-        return namespace;
-    }
-
-    public Date getRevision() {
-        return revision;
-    }
-
     @Override
     public String toString() {
         final StringBuilder result = new StringBuilder(