From 7ce54d65de834d2901285e152c42044e8136c473 Mon Sep 17 00:00:00 2001 From: herbert Date: Sat, 14 Dec 2019 00:22:47 +0100 Subject: update old version of apigateway common data-provider helpserver websocketmanager2 Issue-ID: SDNC-1005 Signed-off-by: herbert Change-Id: I13990aa4329810bb7a7dd815e6149e9890617d07 Signed-off-by: herbert --- sdnr/wt/websocketmanager2/provider/pom.xml | 244 ++++++++++----------- .../WebSocketManagerProvider.java | 18 +- .../OSGI-INF/blueprint/impl-blueprint.xml | 33 --- .../org/opendaylight/blueprint/impl-blueprint.xml | 4 + 4 files changed, 141 insertions(+), 158 deletions(-) delete mode 100644 sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml (limited to 'sdnr/wt/websocketmanager2/provider') diff --git a/sdnr/wt/websocketmanager2/provider/pom.xml b/sdnr/wt/websocketmanager2/provider/pom.xml index 20cf96445..11d212f3f 100644 --- a/sdnr/wt/websocketmanager2/provider/pom.xml +++ b/sdnr/wt/websocketmanager2/provider/pom.xml @@ -11,120 +11,116 @@ OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-provider + 0.7.0-SNAPSHOT + ccsdk-features-sdnr-wt :: ${project.artifactId} + bundle + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + + + true + true + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + + + + + + + + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-provider - 0.7.0-SNAPSHOT - bundle - - ccsdk-features-sdnr-wt :: ${project.artifactId} - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - true - true - - - - - - - - - - - - - - - - ${project.groupId} - sdnr-wt-websocketmanager2-model - ${project.version} - - - javax.servlet - servlet-api - - - org.eclipse.jetty.websocket - websocket-api - - - org.eclipse.jetty.websocket - websocket-servlet - - - io.netty - netty-transport - - - io.netty - netty-all + + + ${project.groupId} + sdnr-wt-websocketmanager2-model + ${project.version} + + + javax.servlet + servlet-api + + + org.eclipse.jetty.websocket + websocket-api + + + org.eclipse.jetty.websocket + websocket-servlet + + + io.netty + netty-transport + + + io.netty + netty-all - - - org.json - json - - - com.typesafe.akka - akka-actor_2.12 - - - com.typesafe.akka - akka-cluster_2.12 - - - org.java-websocket - Java-WebSocket - - - org.mockito - mockito-core + + + org.json + json + + + com.typesafe.akka + akka-actor_2.12 + + + com.typesafe.akka + akka-cluster_2.12 + + + org.java-websocket + Java-WebSocket + + + org.mockito + mockito-core - test - - - org.opendaylight.controller - sal-binding-api - - - org.osgi - org.osgi.core - - - org.osgi - org.osgi.compendium - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-servlet - test - - - - - - + test + + + org.opendaylight.controller + sal-binding-api + + + org.osgi + org.osgi.core + + + org.osgi + org.osgi.compendium + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-servlet + test + + + + + + @@ -137,18 +133,18 @@ - + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - + diff --git a/sdnr/wt/websocketmanager2/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/WebSocketManagerProvider.java b/sdnr/wt/websocketmanager2/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/WebSocketManagerProvider.java index 2c54d2a78..881ee1a82 100644 --- a/sdnr/wt/websocketmanager2/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/WebSocketManagerProvider.java +++ b/sdnr/wt/websocketmanager2/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/WebSocketManagerProvider.java @@ -17,16 +17,22 @@ ******************************************************************************/ package org.onap.ccsdk.features.sdnr.wt.websocketmanager2; +import com.google.common.util.concurrent.ListenableFuture; import javax.servlet.ServletException; import org.opendaylight.mdsal.binding.api.RpcProviderService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105.WebsocketEventInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105.WebsocketEventOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105.WebsocketmanagerService; import org.opendaylight.yangtools.concepts.ObjectRegistration; +import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; import org.osgi.service.http.HttpService; import org.osgi.service.http.NamespaceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class WebSocketManagerProvider extends Blueprint { +public class WebSocketManagerProvider extends Blueprint implements WebsocketmanagerService { private static final Logger LOG = LoggerFactory.getLogger(WebSocketManagerProvider.class); private static final String APPLICATION_NAME = WebSocketManagerProvider.class.getName(); @@ -97,4 +103,14 @@ public class WebSocketManagerProvider extends Blueprint { public void setWsServlet(WebSocketManager wsServlet) { this.wsServlet = wsServlet; } + + @Override + public ListenableFuture> websocketEvent(WebsocketEventInput input) { + if (wsServlet != null) { + return wsServlet.websocketEvent(input); + } else { + RpcResultBuilder result = RpcResultBuilder.failed(); + return result.withError(ErrorType.APPLICATION, "Not intialized").buildFuture(); + } + } } diff --git a/sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml deleted file mode 100644 index 5e95b7b74..000000000 --- a/sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 5e95b7b74..32b19a646 100644 --- a/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -30,4 +30,8 @@ + + -- cgit 1.2.3-korg