Deprecate BindingCodecTreeNode.getSchema()

[mdsal.git] / binding / mdsal-binding-dom-codec / src / main / java / org / opendaylight / mdsal / binding / dom / codec / impl / ClassGeneratorBridge.java

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ClassGeneratorBridge.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ClassGeneratorBridge.java
index 7b2c313f9e1cb67a2c9cd0214f0f71493b324bf8..bf2823c376e7af5775ca4d72c61232f2aba5909a 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ClassGeneratorBridge.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ClassGeneratorBridge.java
@@ -10,10 +10,10 @@ package org.opendaylight.mdsal.binding.dom.codec.impl;
 import static com.google.common.base.Verify.verifyNotNull;
 
 import com.google.common.annotations.Beta;
-import com.google.common.base.Supplier;
+import java.util.function.Supplier;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.mdsal.binding.dom.codec.impl.loader.CodecClassLoader.ClassGenerator;
+import org.opendaylight.mdsal.binding.loader.BindingClassLoader.ClassGenerator;
 
 /**
  * Bridge for initializing generated instance constants during class loading time. This class is public only due to
@@ -24,9 +24,9 @@ public final class ClassGeneratorBridge {
     interface BridgeProvider<T> extends ClassGenerator<T> {
         @Override
         default Class<T> customizeLoading(final @NonNull Supplier<Class<T>> loader) {
-            final BridgeProvider<?> prev = ClassGeneratorBridge.setup(this);
+            final var prev = ClassGeneratorBridge.setup(this);
             try {
-                final Class<T> result = loader.get();
+                final var result = loader.get();
 
                 /*
                  * This a bit of magic to support NodeContextSupplier constants. These constants need to be resolved
@@ -49,24 +49,24 @@ public final class ClassGeneratorBridge {
         }
     }
 
-    interface LocalNameProvider<T> extends BridgeProvider<T> {
+    interface CodecContextSupplierProvider<T> extends BridgeProvider<T> {
 
-        @NonNull String resolveLocalName(@NonNull String methodName);
+        @NonNull CodecContextSupplier resolveCodecContextSupplier(@NonNull String methodName);
     }
 
-    interface NodeContextSupplierProvider<T> extends BridgeProvider<T> {
+    interface LocalNameProvider<T> extends BridgeProvider<T> {
 
-        @NonNull NodeContextSupplier resolveNodeContextSupplier(@NonNull String methodName);
+        @NonNull String resolveLocalName(@NonNull String methodName);
     }
 
     private static final ThreadLocal<BridgeProvider<?>> CURRENT_CUSTOMIZER = new ThreadLocal<>();
 
     private ClassGeneratorBridge() {
-
+        // Hidden on purpose
     }
 
-    public static @NonNull NodeContextSupplier resolveNodeContextSupplier(final @NonNull String methodName) {
-        return current(NodeContextSupplierProvider.class).resolveNodeContextSupplier(methodName);
+    public static @NonNull CodecContextSupplier resolveCodecContextSupplier(final @NonNull String methodName) {
+        return current(CodecContextSupplierProvider.class).resolveCodecContextSupplier(methodName);
     }
 
     public static @NonNull String resolveLocalName(final @NonNull String methodName) {
@@ -74,7 +74,7 @@ public final class ClassGeneratorBridge {
     }
 
     static @Nullable BridgeProvider<?> setup(final @NonNull BridgeProvider<?> next) {
-        final BridgeProvider<?> prev = CURRENT_CUSTOMIZER.get();
+        final var prev = CURRENT_CUSTOMIZER.get();
         CURRENT_CUSTOMIZER.set(verifyNotNull(next));
         return prev;
     }