X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=yanglib%2Fmdsal-yanglib-rfc8525%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fyanglib%2Frfc8525%2FAbstractYangLibraryTest.java;h=3a0fff17c6aeed44aeb3fc45f1a0f25a9a272993;hb=d9a9901b2b9e33685d1702cc7105509c5369625d;hp=26c932b3198500d11bdd2bb408c85edd4a379bd6;hpb=e41e4364042b3fdce4c43c2714fa80470edcbce0;p=mdsal.git

diff --git a/yanglib/mdsal-yanglib-rfc8525/src/test/java/org/opendaylight/mdsal/yanglib/rfc8525/AbstractYangLibraryTest.java b/yanglib/mdsal-yanglib-rfc8525/src/test/java/org/opendaylight/mdsal/yanglib/rfc8525/AbstractYangLibraryTest.java
index 26c932b319..3a0fff17c6 100644
--- a/yanglib/mdsal-yanglib-rfc8525/src/test/java/org/opendaylight/mdsal/yanglib/rfc8525/AbstractYangLibraryTest.java
+++ b/yanglib/mdsal-yanglib-rfc8525/src/test/java/org/opendaylight/mdsal/yanglib/rfc8525/AbstractYangLibraryTest.java
@@ -7,23 +7,24 @@
  */
 package org.opendaylight.mdsal.yanglib.rfc8525;
 
+import java.util.ServiceLoader;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory;
-import org.opendaylight.mdsal.binding.dom.codec.impl.DefaultBindingCodecTreeFactory;
-import org.opendaylight.mdsal.binding.generator.impl.DefaultBindingRuntimeGenerator;
 import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext;
 import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeGenerator;
 import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers;
 import org.opendaylight.yangtools.yang.parser.api.YangParserException;
 import org.opendaylight.yangtools.yang.parser.api.YangParserFactory;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory;
 
 abstract class AbstractYangLibraryTest {
-    private static final BindingRuntimeGenerator BINDING_RUNTIME_GENERATOR = new DefaultBindingRuntimeGenerator();
-    private static final YangParserFactory YANG_PARSER_FACTORY = new DefaultYangParserFactory();
-    private static final BindingCodecTreeFactory CODEC_FACTORY = new DefaultBindingCodecTreeFactory();
+    private static final BindingRuntimeGenerator BINDING_RUNTIME_GENERATOR =
+        ServiceLoader.load(BindingRuntimeGenerator.class).findFirst().orElseThrow();
+    private static final YangParserFactory YANG_PARSER_FACTORY = ServiceLoader.load(YangParserFactory.class).findFirst()
+        .orElseThrow();
+    private static final BindingCodecTreeFactory CODEC_FACTORY = ServiceLoader.load(BindingCodecTreeFactory.class)
+        .findFirst().orElseThrow();
 
     static BindingRuntimeContext runtimeContext;
     static BindingCodecTree codecTree;