BUG-7052: move ModuleIdentifierImpl

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / stmt / Bug6961Test.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6961Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6961Test.java
index 271a06544fb5cfdf891c6533effd04c3609f5a32..28b5642f49090df0a212dbf5e90bb6a33223dea4 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6961Test.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6961Test.java
@@ -11,17 +11,17 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.Sets;
 import java.net.URI;
 import java.util.Date;
+import java.util.Optional;
 import java.util.Set;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
 import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleIdentifierImpl;
+import org.opendaylight.yangtools.yang.model.util.ModuleIdentifierImpl;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext;
 
 public class Bug6961Test {
@@ -29,12 +29,12 @@ public class Bug6961Test {
     @Test
     public void testBug6961SchemaContext() throws Exception {
         final Optional<Date> date = Optional.of(SimpleDateFormatUtil.getRevisionFormat().parse("2016-01-01"));
-        final ModuleIdentifierImpl foo = new ModuleIdentifierImpl("foo", Optional.of(new URI("foo")), date);
-        final ModuleIdentifierImpl sub1Foo = new ModuleIdentifierImpl("sub1-foo", Optional.of(new URI("foo")), date);
-        final ModuleIdentifierImpl sub2Foo = new ModuleIdentifierImpl("sub2-foo", Optional.of(new URI("foo")), date);
-        final ModuleIdentifierImpl bar = new ModuleIdentifierImpl("bar", Optional.of(new URI("bar")), date);
-        final ModuleIdentifierImpl sub1Bar = new ModuleIdentifierImpl("sub1-bar", Optional.of(new URI("bar")), date);
-        final ModuleIdentifierImpl baz = new ModuleIdentifierImpl("baz", Optional.of(new URI("baz")), date);
+        final ModuleIdentifier foo = ModuleIdentifierImpl.create("foo", Optional.of(new URI("foo")), date);
+        final ModuleIdentifier sub1Foo = ModuleIdentifierImpl.create("sub1-foo", Optional.of(new URI("foo")), date);
+        final ModuleIdentifier sub2Foo = ModuleIdentifierImpl.create("sub2-foo", Optional.of(new URI("foo")), date);
+        final ModuleIdentifier bar = ModuleIdentifierImpl.create("bar", Optional.of(new URI("bar")), date);
+        final ModuleIdentifier sub1Bar = ModuleIdentifierImpl.create("sub1-bar", Optional.of(new URI("bar")), date);
+        final ModuleIdentifier baz = ModuleIdentifierImpl.create("baz", Optional.of(new URI("baz")), date);
         final Set<ModuleIdentifier> testSet = Sets.newHashSet(foo, sub1Foo, sub2Foo, bar, sub1Bar, baz);
         final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6961/");
         assertNotNull(context);
@@ -50,7 +50,7 @@ public class Bug6961Test {
         assertEquals(allModuleIdentifiers, testSet);
         assertTrue(allModuleIdentifiers.contains(foo));
         final QNameModule fooQNameModule = foo.getQNameModule();
-        final QNameModule fooQNameModuleCreated = QNameModule.create(new URI("foo"), date.orNull());
+        final QNameModule fooQNameModuleCreated = QNameModule.create(new URI("foo"), date.orElse(null));
         assertEquals(fooQNameModule, fooQNameModuleCreated);
     }
 }
\ No newline at end of file