BUG-865: remove DataSchemaNodeAware

This interface has been integrated into NormalizedNodeStreamWriter
and has no other users: remove it.

Change-Id: If7d6923c52f15fdc79784edcbb8b665368961082
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/DataSchemaNodeAware.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/DataSchemaNodeAware.java
deleted file mode 100644 (file)
index 8b086c2..0000000
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/DataSchemaNodeAware.java
+++ /dev/null
@@ -1,31 +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.yang.data.api.schema.stream;
-
-import com.google.common.annotations.Beta;
-import javax.annotation.Nonnull;
-import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
-
-/**
- * Mixin interface for {@link NormalizedNodeStreamWriter} allowing callers to inform the writer of the
- * {@link DataSchemaNode} corresponding to the next node which will either be started or emitted. This interface should
- * not be implemented directly.
- *
- * @deprecated This interface has been integrated into {@link NormalizedNodeStreamWriter}.
- */
-@Deprecated
-@Beta
-public interface DataSchemaNodeAware {
-    /**
-     * Attach the specified {@link DataSchemaNode} to the next node which will get started or emitted.
-     *
-     * @param schema DataSchemaNode
-     * @throws NullPointerException if the argument is null
-     */
-    void nextDataSchemaNode(@Nonnull DataSchemaNode schema);
-}

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamWriter.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamWriter.java
index 1b1bd097b1988527355cd14dcb1e80ccf3e20682..059ed1b0e4dbcf48aaa00edc0778fcc2b5a79298 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamWriter.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamWriter.java
@@ -77,7 +77,7 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
  * and resources needlessly.
  *
  */
-public interface NormalizedNodeStreamWriter extends Closeable, Flushable, DataSchemaNodeAware {
+public interface NormalizedNodeStreamWriter extends Closeable, Flushable {
 
     /**
      * Methods in this interface allow users to hint the underlying
@@ -482,7 +482,6 @@ public interface NormalizedNodeStreamWriter extends Closeable, Flushable, DataSc
      * @param schema DataSchemaNode
      * @throws NullPointerException if the argument is null
      */
-    @Override
     default void nextDataSchemaNode(@Nonnull final DataSchemaNode schema) {
         Preconditions.checkNotNull(schema);
     }