From 9691f2a251c6914b9d1a14bea78c4a1d43bbe2e5 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 4 Sep 2017 15:24:34 +0200 Subject: [PATCH] Finish removal of yangtools classes This finishes the package move by removing the bridge classes. Change-Id: I7e5519db7be39e8fdb03c9f330ce77a0b6e982b8 Signed-off-by: Robert Varga --- binding/mdsal-binding-dom-codec/pom.xml | 2 -- .../impl/DataObjectSerializerGenerator.java | 5 +-- .../BindingNormalizedNodeCodecRegistry.java | 8 +---- .../codec/impl/MissingSchemaException.java | 5 ++- .../impl/DataObjectSerializerGenerator.java | 33 ------------------- .../codec/gen/impl/StreamWriterGenerator.java | 20 ----------- .../BindingNormalizedNodeCodecRegistry.java | 22 ------------- .../codec/impl/MissingSchemaException.java | 28 ---------------- 8 files changed, 4 insertions(+), 119 deletions(-) delete mode 100644 binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/DataObjectSerializerGenerator.java delete mode 100644 binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/StreamWriterGenerator.java delete mode 100644 binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingNormalizedNodeCodecRegistry.java delete mode 100644 binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/MissingSchemaException.java diff --git a/binding/mdsal-binding-dom-codec/pom.xml b/binding/mdsal-binding-dom-codec/pom.xml index bb41aeabc4..e2d426a06a 100644 --- 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 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 4bd29a4a9e..bbace44e96 100644 --- 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 d7ac8cb444..1b50ce2609 100644 --- 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, 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 76947cd035..06000db634 100644 --- 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 index 922fa8f667..0000000000 --- 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 index 95e3bce26d..0000000000 --- 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 index b72fdf3aed..0000000000 --- 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 index 5040f2cb71..0000000000 --- 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); - } -} -- 2.36.6