Fix various warnings

[yangtools.git] / code-generator / binding-generator-impl / src / main / java / org / opendaylight / yangtools / sal / binding / generator / impl / LazyGeneratedCodecRegistry.java

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/LazyGeneratedCodecRegistry.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/LazyGeneratedCodecRegistry.java
index a2dd0905044b1174bca5e9c7b137ea8d1a6930ae..dee6ee6e1f731206c2862d1d35640c74cb16f783 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/LazyGeneratedCodecRegistry.java
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/LazyGeneratedCodecRegistry.java
@@ -41,7 +41,7 @@ import com.google.common.base.Preconditions;
 
 public class LazyGeneratedCodecRegistry implements //
         CodecRegistry, //
-        SchemaServiceListener, //
+        SchemaContextListener, //
         GeneratorListener {
 
     private final static Logger LOG = LoggerFactory.getLogger(LazyGeneratedCodecRegistry.class);
@@ -85,10 +85,11 @@ public class LazyGeneratedCodecRegistry implements //
 
     private SchemaContext currentSchema;
 
-    private GeneratedClassLoadingStrategy classLoadingStrategy = GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy();
+    private final GeneratedClassLoadingStrategy classLoadingStrategy;
 
-    LazyGeneratedCodecRegistry(SchemaLock lock) {
+    LazyGeneratedCodecRegistry(SchemaLock lock, GeneratedClassLoadingStrategy identityClassLoadingStrategy) {
         this.lock = Preconditions.checkNotNull(lock);
+        this.classLoadingStrategy = identityClassLoadingStrategy;
     }
 
     public SchemaLock getLock() {
@@ -562,7 +563,6 @@ public class LazyGeneratedCodecRegistry implements //
         private ChoiceCaseNode schema;
 
         public void setSchema(ChoiceCaseNode caseNode) {
-            this.schema = schema;
             this.schema = caseNode;
             validNames = new HashSet<>();
             validQNames = new HashSet<>();
@@ -730,7 +730,7 @@ public class LazyGeneratedCodecRegistry implements //
      * This map is used as only facade for
      * {@link org.opendaylight.yangtools.yang.binding.BindingCodec} in different
      * classloaders to retrieve codec dynamicly based on provided key.
-     * 
+     *
      * @param <T>
      *            Key type
      */