From: Robert Varga Date: Wed, 17 Feb 2016 14:47:20 +0000 (+0100) Subject: Remove NormalizedNodeStreamReader X-Git-Tag: release/boron~358 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=70a1d4634bd92bf970077e269dc4433d1719f6fb Remove NormalizedNodeStreamReader This class has been superseded by NormalizedNodeDataInput, remove it. Change-Id: I11c915f4aff6ca217e096c42ba1115043a99a3ab Signed-off-by: Robert Varga --- diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputStreamReader.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputStreamReader.java index a31a611d33..3f6cbb743b 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputStreamReader.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputStreamReader.java @@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory; * */ -public class NormalizedNodeInputStreamReader implements NormalizedNodeDataInput, NormalizedNodeStreamReader { +public class NormalizedNodeInputStreamReader implements NormalizedNodeDataInput { private static final Logger LOG = LoggerFactory.getLogger(NormalizedNodeInputStreamReader.class); diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReader.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReader.java deleted file mode 100644 index b055055b40..0000000000 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReader.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2014, 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.controller.cluster.datastore.node.utils.stream; - -/** - * Interface for a class that can read serialized NormalizedNode instances from a stream. - * - * @deprecated Use {@link NormalizedNodeDataInput} instead. - */ -public interface NormalizedNodeStreamReader extends NormalizedNodeDataInput { -} diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SampleNormalizedNodeSerializable.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SampleNormalizedNodeSerializable.java index 6539015756..e40dcbc6ac 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SampleNormalizedNodeSerializable.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SampleNormalizedNodeSerializable.java @@ -33,7 +33,7 @@ public class SampleNormalizedNodeSerializable implements Serializable { } private void readObject(final ObjectInputStream stream) throws IOException, ClassNotFoundException, URISyntaxException { - NormalizedNodeStreamReader reader = new NormalizedNodeInputStreamReader((DataInput)stream); + NormalizedNodeDataInput reader = new NormalizedNodeInputStreamReader((DataInput)stream); this.input = reader.readNormalizedNode(); }