Remove RpcResultBuilderCompat

This is an ABI compat class, remove it for next major release.

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

diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilder.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilder.java
index 2641613e02afdf7b2defcd9ff188b47b66a130ae..a132d2e6b3c43d4a4eb86b75c629b4420021c56a 100644 (file)
--- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilder.java
+++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilder.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
  *
  * @param <T> the result value type
  */
-public final class RpcResultBuilder<T> extends RpcResultBuilderCompat<T> implements Builder<RpcResult<T>> {
+public final class RpcResultBuilder<T> implements Builder<RpcResult<T>> {
 
     private static class RpcResultImpl<T> implements RpcResult<T>, Serializable {
         private static final long serialVersionUID = 1L;
@@ -420,7 +420,6 @@ public final class RpcResultBuilder<T> extends RpcResultBuilderCompat<T> impleme
      *
      * @return Future for RpcResult built by RpcResultBuilder
      */
-    @Override
     public FluentFuture<RpcResult<T>> buildFuture() {
         return FluentFuture.from(Futures.immediateFuture(build()));
     }

diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilderCompat.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilderCompat.java
deleted file mode 100644 (file)
index 6fdb992..0000000
--- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilderCompat.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2018 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.yang.common;
-
-import com.google.common.util.concurrent.ListenableFuture;
-
-/**
- * Package-internal compatibility superclass for RpcResultBuilder. This is necessary to ensure
- * {@link RpcResultBuilder#buildFuture()} remains ABI-compatible with ListenableFuture return.
- *
- * @deprecated Remove this class in 3.0.0.
- */
-@Deprecated
-abstract class RpcResultBuilderCompat<T> {
-
-    public abstract ListenableFuture<RpcResult<T>> buildFuture();
-}