From: Robert Varga Date: Mon, 3 Jun 2019 09:18:49 +0000 (+0200) Subject: Remove sal-connector-api X-Git-Tag: release/sodium~69 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=refs%2Fchanges%2F79%2F82379%2F2;ds=sidebyside Remove sal-connector-api This artifact is not used anywhere, remove it. Change-Id: I43a9df5d77abf28d652ea9289025b49638dad702 Signed-off-by: Robert Varga --- diff --git a/docs/pom.xml b/docs/pom.xml index 2d4b2122a1..235c534c50 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -110,10 +110,6 @@ org.opendaylight.controller sal-binding-util - - org.opendaylight.controller - sal-connector-api - org.opendaylight.controller sal-inmemory-datastore diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml index f2974eb3bf..01eeecc442 100644 --- a/features/mdsal/odl-mdsal-broker-local/pom.xml +++ b/features/mdsal/odl-mdsal-broker-local/pom.xml @@ -106,10 +106,6 @@ ${project.groupId} sal-binding-broker-impl - - ${project.groupId} - sal-connector-api - ${project.groupId} sal-inmemory-datastore diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml index 665023d340..248ada1fdc 100644 --- a/features/mdsal/odl-mdsal-broker/pom.xml +++ b/features/mdsal/odl-mdsal-broker/pom.xml @@ -86,9 +86,5 @@ ${project.groupId} sal-binding-broker-impl - - ${project.groupId} - sal-connector-api - diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml index 28982ab106..899d59ed39 100644 --- a/opendaylight/md-sal/mdsal-artifacts/pom.xml +++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml @@ -76,11 +76,6 @@ sal-binding-util ${project.version} - - ${project.groupId} - sal-connector-api - ${project.version} - ${project.groupId} sal-inmemory-datastore diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index e5bbfa750c..aa7e5c51aa 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -38,9 +38,6 @@ samples - - sal-connector-api - sal-akka-raft sal-akka-raft-example diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml deleted file mode 100644 index 8de025808f..0000000000 --- a/opendaylight/md-sal/sal-connector-api/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - - org.opendaylight.controller - mdsal-parent - 1.10.0-SNAPSHOT - ../parent - - - org.opendaylight.controller - sal-connector-api - 1.10.0-SNAPSHOT - bundle - - - - org.opendaylight.controller - sal-core-api - - - org.opendaylight.mdsal - yang-binding - - - org.opendaylight.yangtools - yang-data-api - - - org.opendaylight.yangtools - yang-model-api - - - - - scm:git:http://git.opendaylight.org/gerrit/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - HEAD - https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL - - - 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 index 22366f8f85..0000000000 --- a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareRpcRouter.java +++ /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 { - - @Override - Future> sendRpc( - RpcRequest input); - - @SuppressFBWarnings("EI_EXPOSE_REP2") - class BindingAwareRequest implements RpcRequest, 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, 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 index 27e403e24b..0000000000 --- a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareZeroMqRpcRouter.java +++ /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> sendRpc(RpcRequest 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 index 5f99addf20..0000000000 --- a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/ConnectorListener.java +++ /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 prefixes); - - void onPrefixesWithdrawn(Set 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 index c56560ac75..0000000000 --- a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/RpcRouter.java +++ /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 Routing Context Identifier - * @param Route Type - * @param Rpc Type - * @param Data Type - */ -public interface RpcRouter { - Future> sendRpc(RpcRequest input); - - - /** - * Interface for an RPC request. - * - * @param Routing Context Identifier - * @param Route Type - * @param Rpc Type - * @param Data Type - */ - interface RpcRequest { - - RouteIdentifier getRoutingInformation(); - - D getPayload(); - } - - interface RouteIdentifier { - - C getContext(); // defines a routing table (e.g. NodeContext) - - T getType(); // rpc type - - R getRoute(); // e.g. (node identity) - } - - interface RpcReply { - D getPayload(); - } -}