From: Tom Pantelis <tompantelis@gmail.com>
Date: Fri, 23 Mar 2018 14:33:46 +0000 (-0400)
Subject: Remove deprecated Rpcs and RpcErrors
X-Git-Tag: release/fluorine~134
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=808fd3e486b29843cb71f7b95c6677290c4a331c

Remove deprecated Rpcs and RpcErrors

The only user was in snmp4sdn and a patch has been submitted
for that.

Change-Id: I751a6c1181187e1bd0207f31965f61d6d494434d
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
---

diff --git a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/RpcErrors.java b/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/RpcErrors.java
deleted file mode 100644
index ad550da293..0000000000
--- a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/RpcErrors.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2013 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.sal.common.util;
-
-import org.opendaylight.yangtools.yang.common.RpcError;
-import org.opendaylight.yangtools.yang.common.RpcError.ErrorSeverity;
-import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
-
-/**
- * Deprecated.
- *
- * @deprecated Use {@link org.opendaylight.yangtools.yang.common.RpcResultBuilder}
- */
-@Deprecated
-public final class RpcErrors {
-    private RpcErrors() {
-    }
-
-    /**
-     * Creates an RpcError.
-     *
-     * @return {@link RpcError} implementation
-     */
-    public static RpcError getRpcError(String applicationTag, String tag, String info,
-            ErrorSeverity severity, String message, ErrorType errorType, Throwable cause) {
-        RpcErrorTO ret = new RpcErrorTO(applicationTag, tag, info, severity, message,
-                errorType, cause);
-        return ret;
-    }
-
-    private static class RpcErrorTO implements RpcError {
-
-        private final String applicationTag;
-        private final String tag;
-        private final String info;
-        private final ErrorSeverity severity;
-        private final String message;
-        private final ErrorType errorType;
-        private final Throwable cause;
-
-        protected RpcErrorTO(String applicationTag, String tag, String info,
-                ErrorSeverity severity, String message, ErrorType errorType, Throwable cause) {
-            this.applicationTag = applicationTag;
-            this.tag = tag;
-            this.info = info;
-            this.severity = severity;
-            this.message = message;
-            this.errorType = errorType;
-            this.cause = cause;
-        }
-
-        @Override
-        public String getApplicationTag() {
-            return applicationTag;
-        }
-
-        @Override
-        public String getInfo() {
-            return info;
-        }
-
-        @Override
-        public String getMessage() {
-            return message;
-        }
-
-        @Override
-        public ErrorSeverity getSeverity() {
-            return severity;
-        }
-
-        @Override
-        public String getTag() {
-            return tag;
-        }
-
-        @Override
-        public Throwable getCause() {
-            return cause;
-        }
-
-        @Override
-        public ErrorType getErrorType() {
-            return errorType;
-        }
-    }
-}
diff --git a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Rpcs.java b/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Rpcs.java
deleted file mode 100644
index 3278cef198..0000000000
--- a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Rpcs.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2013 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.sal.common.util;
-
-import com.google.common.collect.ImmutableList;
-import java.util.Collection;
-import org.opendaylight.yangtools.concepts.Immutable;
-import org.opendaylight.yangtools.yang.common.RpcError;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-
-/**
- * Deprecated.
- *
- * @deprecated Use {@link org.opendaylight.yangtools.yang.common.RpcResultBuilder}
- */
-@Deprecated
-public final class Rpcs {
-    private Rpcs() {
-    }
-
-    public static <T> RpcResult<T> getRpcResult(boolean successful) {
-        return new RpcResultTO<>(successful, null, ImmutableList.of());
-    }
-
-    public static <T> RpcResult<T> getRpcResult(boolean successful, T result,
-            Collection<RpcError> errors) {
-        return new RpcResultTO<>(successful, result, errors);
-    }
-
-    public static <T> RpcResult<T> getRpcResult(boolean successful, Collection<RpcError> errors) {
-        return new RpcResultTO<>(successful, null, errors);
-    }
-
-    private static class RpcResultTO<T> implements RpcResult<T>, Immutable {
-        private final Collection<RpcError> errors;
-        private final T result;
-        private final boolean successful;
-
-        RpcResultTO(boolean successful, T result, Collection<RpcError> errors) {
-            this.successful = successful;
-            this.result = result;
-            this.errors = ImmutableList.copyOf(errors);
-        }
-
-        @Override
-        public boolean isSuccessful() {
-            return successful;
-        }
-
-        @Override
-        public T getResult() {
-            return result;
-        }
-
-        @Override
-        public Collection<RpcError> getErrors() {
-            return errors;
-        }
-    }
-}