Finish removal of yangtools classes

This finishes the package move by removing the bridge classes.

Change-Id: I7e5519db7be39e8fdb03c9f330ce77a0b6e982b8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-codec/pom.xml b/binding/mdsal-binding-dom-codec/pom.xml
index bb41aeabc40a293ce31986d5af988093f82fa69a..e2d426a06ab4e71a40440f17bd7f2a61e0315804 100644 (file)
--- a/binding/mdsal-binding-dom-codec/pom.xml
+++ b/binding/mdsal-binding-dom-codec/pom.xml
@@ -96,8 +96,6 @@
                             org.opendaylight.mdsal.binding.dom.codec.*,
                             org.opendaylight.mdsal.binding.dom.codec.gen.impl.*,
                             org.opendaylight.mdsal.binding.dom.codec.impl.*,
-                            org.opendaylight.yangtools.binding.data.codec.gen.impl.*,
-                            org.opendaylight.yangtools.binding.data.codec.impl.*,
                             ;-split-package:=error
                         </Export-Package>
                     </instructions>

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/impl/DataObjectSerializerGenerator.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/impl/DataObjectSerializerGenerator.java
index 4bd29a4a9e5716e5028f1987a6346d40e7b10229..bbace44e966f6b687f6320785d0ec04bf19dc1e7 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/impl/DataObjectSerializerGenerator.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/impl/DataObjectSerializerGenerator.java
@@ -13,21 +13,18 @@ import org.opendaylight.yangtools.yang.binding.DataObjectSerializerImplementatio
 /**
  * Public interface exposed from generator implementation.
  */
-public interface DataObjectSerializerGenerator
-        extends org.opendaylight.yangtools.binding.data.codec.gen.impl.DataObjectSerializerGenerator {
+public interface DataObjectSerializerGenerator {
     /**
      * Get a serializer for a particular type.
      *
      * @param type Type class
      * @return Serializer instance.
      */
-    @Override
     DataObjectSerializerImplementation getSerializer(Class<?> type);
 
     /**
      * Notify the generator that the runtime context has been updated.
      * @param runtime New runtime context
      */
-    @Override
     void onBindingRuntimeContextUpdated(BindingRuntimeContext runtime);
 }

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingNormalizedNodeCodecRegistry.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingNormalizedNodeCodecRegistry.java
index d7ac8cb4440fd779537e203c8efec031515ce760..1b50ce260993929bbe37361a8f690f21dd50bd7a 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingNormalizedNodeCodecRegistry.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingNormalizedNodeCodecRegistry.java
@@ -58,16 +58,10 @@ public class BindingNormalizedNodeCodecRegistry implements DataObjectSerializerR
         BindingNormalizedNodeSerializer {
     private static final Logger LOG = LoggerFactory.getLogger(BindingNormalizedNodeCodecRegistry.class);
 
-    private final org.opendaylight.yangtools.binding.data.codec.gen.impl.DataObjectSerializerGenerator generator;
+    private final DataObjectSerializerGenerator generator;
     private final LoadingCache<Class<? extends DataObject>, DataObjectSerializer> serializers;
     private volatile BindingCodecContext codecContext;
 
-    @Deprecated
-    public BindingNormalizedNodeCodecRegistry(final org.opendaylight.yangtools.binding.data.codec.gen.impl.DataObjectSerializerGenerator generator) {
-        this.generator = Preconditions.checkNotNull(generator);
-        this.serializers = CacheBuilder.newBuilder().weakKeys().build(new GeneratorLoader());
-    }
-
     public BindingNormalizedNodeCodecRegistry(final DataObjectSerializerGenerator generator) {
         this.generator = Preconditions.checkNotNull(generator);
         this.serializers = CacheBuilder.newBuilder().weakKeys().build(new GeneratorLoader());

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MissingSchemaException.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MissingSchemaException.java
index 76947cd035ff6f150b7f127ed5e4dcf65189e833..06000db634aac62d3b4fa24586416735a9788e67 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MissingSchemaException.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MissingSchemaException.java
@@ -15,10 +15,9 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 /**
- * Thrown when codec was used with data which are not modeled
- * and available in schema used by codec.
+ * Thrown when codec was used with data which are not modeled and available in schema used by codec.
  */
-public class MissingSchemaException extends org.opendaylight.yangtools.binding.data.codec.impl.MissingSchemaException {
+public class MissingSchemaException extends IllegalArgumentException {
 
     private static final long serialVersionUID = 1L;
 

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/DataObjectSerializerGenerator.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/DataObjectSerializerGenerator.java
deleted file mode 100644 (file)
index 922fa8f..0000000
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/DataObjectSerializerGenerator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.binding.data.codec.gen.impl;
-
-import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext;
-import org.opendaylight.yangtools.yang.binding.DataObjectSerializerImplementation;
-
-/**
- * Public interface exposed from generator implementation.
- *
- * @deprecated Use {@link org.opendaylight.mdsal.binding.dom.codec.gen.impl.DataObjectSerializerGenerator} instead.
- */
-@Deprecated
-public interface DataObjectSerializerGenerator {
-    /**
-     * Get a serializer for a particular type.
-     *
-     * @param type Type class
-     * @return Serializer instance.
-     */
-    DataObjectSerializerImplementation getSerializer(Class<?> type);
-
-    /**
-     * Notify the generator that the runtime context has been updated.
-     * @param runtime New runtime context
-     */
-    void onBindingRuntimeContextUpdated(BindingRuntimeContext runtime);
-}

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/StreamWriterGenerator.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/StreamWriterGenerator.java
deleted file mode 100644 (file)
index 95e3bce..0000000
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/StreamWriterGenerator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2017 Pantheon Technologies, s.r.o. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.binding.data.codec.gen.impl;
-
-import org.opendaylight.mdsal.binding.generator.util.JavassistUtils;
-
-/**
- * @deprecated Use {@link org.opendaylight.mdsal.binding.dom.codec.gen.impl.StreamWriterGenerator} instead.
- */
-@Deprecated
-public class StreamWriterGenerator {
-    public static DataObjectSerializerGenerator create(final JavassistUtils utils) {
-        return org.opendaylight.mdsal.binding.dom.codec.gen.impl.StreamWriterGenerator.create(utils);
-    }
-}

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingNormalizedNodeCodecRegistry.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingNormalizedNodeCodecRegistry.java
deleted file mode 100644 (file)
index b72fdf3..0000000
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingNormalizedNodeCodecRegistry.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2017 Pantheon Technologies, s.r.o. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.binding.data.codec.impl;
-
-import org.opendaylight.yangtools.binding.data.codec.gen.impl.DataObjectSerializerGenerator;
-
-/**
- * @deprecated Use {@link org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry} instead.
- */
-@Deprecated
-public class BindingNormalizedNodeCodecRegistry
-        extends org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry {
-
-    public BindingNormalizedNodeCodecRegistry(final DataObjectSerializerGenerator generator) {
-        super(generator);
-    }
-}

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/MissingSchemaException.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/MissingSchemaException.java
deleted file mode 100644 (file)
index 5040f2c..0000000
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/MissingSchemaException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.binding.data.codec.impl;
-
-/**
- * Thrown when codec was used with data which are not modeled
- * and available in schema used by codec.
- *
- * @deprecated Use {@link org.opendaylight.mdsal.binding.dom.codec.impl.MissingSchemaException} instead.
- */
-@Deprecated
-public class MissingSchemaException extends IllegalArgumentException {
-
-    private static final long serialVersionUID = 1L;
-
-    protected MissingSchemaException(final String msg) {
-        super(msg);
-    }
-
-    protected MissingSchemaException(final String msg, final Throwable cause) {
-        super(msg, cause);
-    }
-}