Remove sal-connector-api 79/82379/2
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 3 Jun 2019 09:18:49 +0000 (11:18 +0200)
committerStephen Kitt <skitt@redhat.com>
Mon, 3 Jun 2019 14:03:59 +0000 (14:03 +0000)
This artifact is not used anywhere, remove it.

Change-Id: I43a9df5d77abf28d652ea9289025b49638dad702
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
docs/pom.xml
features/mdsal/odl-mdsal-broker-local/pom.xml
features/mdsal/odl-mdsal-broker/pom.xml
opendaylight/md-sal/mdsal-artifacts/pom.xml
opendaylight/md-sal/pom.xml
opendaylight/md-sal/sal-connector-api/pom.xml [deleted file]
opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareRpcRouter.java [deleted file]
opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareZeroMqRpcRouter.java [deleted file]
opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/ConnectorListener.java [deleted file]
opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/RpcRouter.java [deleted file]

index 2d4b2122a1dd76784e365927b5c1fa938f172818..235c534c50461f07c3df110048541779cea0823e 100644 (file)
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-util</artifactId>
         </dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-connector-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-inmemory-datastore</artifactId>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-inmemory-datastore</artifactId>
index f2974eb3bf78143f3ebdf88d7957fb296f111661..01eeecc442c063bb45d46212d6129acba925d559 100644 (file)
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
         </dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sal-connector-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-inmemory-datastore</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-inmemory-datastore</artifactId>
index 665023d3409860e28ec953e0ff73790552a2d69a..248ada1fdc28e292fd16a39dc8bca2df0b5ac0fa 100644 (file)
@@ -86,9 +86,5 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
         </dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sal-connector-api</artifactId>
-        </dependency>
     </dependencies>
 </project>
     </dependencies>
 </project>
index 28982ab106bc1779e668199f1ed24e156b12670b..899d59ed39c7ac71d57cffdcb497786058a85061 100644 (file)
                 <artifactId>sal-binding-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
                 <artifactId>sal-binding-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-connector-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>sal-inmemory-datastore</artifactId>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>sal-inmemory-datastore</artifactId>
index e5bbfa750c1984773e590f1d370b3b0d55ff619c..aa7e5c51aaaefc04732a7ce87bcc71e9952fe9d9 100644 (file)
@@ -38,9 +38,6 @@
     <!-- Samples -->
     <module>samples</module>
 
     <!-- Samples -->
     <module>samples</module>
 
-    <!-- Connectors -->
-    <module>sal-connector-api</module>
-
     <module>sal-akka-raft</module>
     <module>sal-akka-raft-example</module>
 
     <module>sal-akka-raft</module>
     <module>sal-akka-raft-example</module>
 
diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml
deleted file mode 100644 (file)
index 8de0258..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-parent</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
-  </parent>
-
-  <groupId>org.opendaylight.controller</groupId>
-  <artifactId>sal-connector-api</artifactId>
-  <version>1.10.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-core-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>yang-binding</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yang-data-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yang-model-api</artifactId>
-    </dependency>
-  </dependencies>
-
-  <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-  </scm>
-
-</project>
diff --git a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareRpcRouter.java b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareRpcRouter.java
deleted file mode 100644 (file)
index 22366f8..0000000
+++ /dev/null
@@ -1,126 +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.controller.sal.connector.api;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.concurrent.Future;
-import org.opendaylight.yangtools.concepts.Immutable;
-
-public interface BindingAwareRpcRouter extends RpcRouter<String, String, String, byte[]> {
-
-    @Override
-    Future<org.opendaylight.controller.sal.connector.api.RpcRouter.RpcReply<byte[]>> sendRpc(
-            RpcRequest<String, String, String, byte[]> input);
-
-    @SuppressFBWarnings("EI_EXPOSE_REP2")
-    class BindingAwareRequest implements RpcRequest<String, String, String, byte[]>, Immutable {
-
-        private final BindingAwareRouteIdentifier routingInformation;
-        private final byte[] payload;
-
-        public BindingAwareRequest(BindingAwareRouteIdentifier routingInformation, byte[] payload) {
-            this.routingInformation = routingInformation;
-            this.payload = payload;
-        }
-
-        @Override
-        public BindingAwareRouteIdentifier getRoutingInformation() {
-            return this.routingInformation;
-        }
-
-        @Override
-        @SuppressFBWarnings("EI_EXPOSE_REP")
-        public byte[] getPayload() {
-            return payload;
-        }
-    }
-
-    class BindingAwareRouteIdentifier implements RouteIdentifier<String, String, String>, Immutable {
-
-        private final String type;
-        private final String route;
-        private final String content;
-
-        public BindingAwareRouteIdentifier(String type, String route, String content) {
-            this.type = type;
-            this.route = route;
-            this.content = content;
-        }
-
-        /**
-         * Java class name of Rpc Context.
-         */
-        @Override
-        public String getContext() {
-            return this.content;
-        }
-
-        /**
-         * String representation of route e.g. node-id
-         *
-         */
-        @Override
-        public String getRoute() {
-            return this.route;
-        }
-
-        /**
-         * Java class name of Rpc Type e.g org.opendaylight.AddFlowInput.
-         */
-        @Override
-        public String getType() {
-            return this.type;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + (content == null ? 0 : content.hashCode());
-            result = prime * result + (route == null ? 0 : route.hashCode());
-            result = prime * result + (type == null ? 0 : type.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            BindingAwareRouteIdentifier other = (BindingAwareRouteIdentifier) obj;
-            if (content == null) {
-                if (other.content != null) {
-                    return false;
-                }
-            } else if (!content.equals(other.content)) {
-                return false;
-            }
-            if (route == null) {
-                if (other.route != null) {
-                    return false;
-                }
-            } else if (!route.equals(other.route)) {
-                return false;
-            }
-            if (type == null) {
-                if (other.type != null) {
-                    return false;
-                }
-            } else if (!type.equals(other.type)) {
-                return false;
-            }
-            return true;
-        }
-    }
-}
diff --git a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareZeroMqRpcRouter.java b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareZeroMqRpcRouter.java
deleted file mode 100644 (file)
index 27e403e..0000000
+++ /dev/null
@@ -1,32 +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.controller.sal.connector.api;
-
-import java.util.concurrent.Future;
-
-public class BindingAwareZeroMqRpcRouter implements BindingAwareRpcRouter {
-
-    BindingAwareRpcRouter mdSalRouter;
-
-    public BindingAwareRpcRouter getMdSalRouter() {
-        return mdSalRouter;
-    }
-
-
-    public void setMdSalRouter(BindingAwareRpcRouter mdSalRouter) {
-        this.mdSalRouter = mdSalRouter;
-    }
-
-
-    @Override
-    public Future<RpcReply<byte[]>> sendRpc(RpcRequest<String, String, String, byte[]> input) {
-        // Write message down to the wire
-        return null;
-    }
-
-}
diff --git a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/ConnectorListener.java b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/ConnectorListener.java
deleted file mode 100644 (file)
index 5f99add..0000000
+++ /dev/null
@@ -1,17 +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.connector.api;
-
-import java.util.Set;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-
-public interface ConnectorListener {
-    void onPrefixesAnnounced(Set<YangInstanceIdentifier> prefixes);
-
-    void onPrefixesWithdrawn(Set<YangInstanceIdentifier> prefixes);
-}
diff --git a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/RpcRouter.java b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/RpcRouter.java
deleted file mode 100644 (file)
index c56560a..0000000
+++ /dev/null
@@ -1,53 +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.controller.sal.connector.api;
-
-import java.util.concurrent.Future;
-
-/**
- * Interface for an RPC router.
- *
- * @author ttkacik
- *
- * @param <C> Routing Context Identifier
- * @param <R> Route Type
- * @param <T> Rpc Type
- * @param <D> Data Type
- */
-public interface RpcRouter<C,T,R,D> {
-    Future<RpcReply<D>> sendRpc(RpcRequest<C, T, R, D> input);
-
-
-    /**
-     * Interface for an RPC request.
-     *
-     * @param <C> Routing Context Identifier
-     * @param <R> Route Type
-     * @param <T> Rpc Type
-     * @param <D> Data Type
-     */
-    interface RpcRequest<C,T,R,D> {
-
-        RouteIdentifier<C,T,R> getRoutingInformation();
-
-        D getPayload();
-    }
-
-    interface RouteIdentifier<C,T,R> {
-
-        C getContext(); // defines a routing table (e.g. NodeContext)
-
-        T getType(); // rpc type
-
-        R getRoute(); // e.g. (node identity)
-    }
-
-    interface RpcReply<D> {
-        D getPayload();
-    }
-}