Remove {Base,Transaction}ServicesWrapper

These interfaces are just simple combination of JAX-RS services, remove
them to make inheritance a bit clearer.

JIRA: NETCONF-773
Change-Id: I47c4cc866f64143d8042a729bfe56d4a9860cec1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/TransactionServicesWrapper.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/TransactionServicesWrapper.java
deleted file mode 100644 (file)
index 1855db9..0000000
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/TransactionServicesWrapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2016 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.restconf.nb.rfc8040.rests.services.api;
-
-/**
- * Wrapper for all transaction services.
- * <ul>
- * <li>{@link RestconfDataService}
- * <li>{@link RestconfInvokeOperationsService}
- * <li>{@link RestconfStreamsSubscriptionService}
- * </ul>
- *
- */
-public interface TransactionServicesWrapper
-        extends RestconfDataService, RestconfInvokeOperationsService, RestconfStreamsSubscriptionService {
-
-}

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/api/BaseServicesWrapper.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/api/BaseServicesWrapper.java
deleted file mode 100644 (file)
index b0dad41..0000000
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/api/BaseServicesWrapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2016 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.restconf.nb.rfc8040.services.simple.api;
-
-import org.opendaylight.restconf.nb.rfc8040.rests.services.api.RestconfOperationsService;
-import org.opendaylight.restconf.nb.rfc8040.rests.services.api.RestconfSchemaService;
-import org.opendaylight.restconf.nb.rfc8040.rests.services.api.RestconfService;
-
-/**
- * Wrapper for all base services.
- * <ul>
- *   <li>{@link RestconfOperationsService}</li>
- *   <li>{@link RestconfSchemaService}</li>
- * </ul>
- */
-public interface BaseServicesWrapper extends RestconfOperationsService, RestconfSchemaService, RestconfService {
-
-}

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/wrapper/ServicesWrapper.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/wrapper/ServicesWrapper.java
index 0aeb63927270ea4a06b3b7ea53921fe444e5a99f..89ccec598dd5eb1a99fc03ba25af83e76b4c2ab6 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/wrapper/ServicesWrapper.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/wrapper/ServicesWrapper.java
@@ -29,25 +29,20 @@ import org.opendaylight.restconf.nb.rfc8040.rests.services.api.RestconfOperation
 import org.opendaylight.restconf.nb.rfc8040.rests.services.api.RestconfSchemaService;
 import org.opendaylight.restconf.nb.rfc8040.rests.services.api.RestconfService;
 import org.opendaylight.restconf.nb.rfc8040.rests.services.api.RestconfStreamsSubscriptionService;
-import org.opendaylight.restconf.nb.rfc8040.rests.services.api.TransactionServicesWrapper;
 import org.opendaylight.restconf.nb.rfc8040.rests.services.impl.RestconfDataServiceImpl;
 import org.opendaylight.restconf.nb.rfc8040.rests.services.impl.RestconfImpl;
 import org.opendaylight.restconf.nb.rfc8040.rests.services.impl.RestconfInvokeOperationsServiceImpl;
 import org.opendaylight.restconf.nb.rfc8040.rests.services.impl.RestconfOperationsServiceImpl;
 import org.opendaylight.restconf.nb.rfc8040.rests.services.impl.RestconfSchemaServiceImpl;
 import org.opendaylight.restconf.nb.rfc8040.rests.services.impl.RestconfStreamsSubscriptionServiceImpl;
-import org.opendaylight.restconf.nb.rfc8040.services.simple.api.BaseServicesWrapper;
 import org.opendaylight.restconf.nb.rfc8040.streams.Configuration;
 
 /**
  * Wrapper for services.
- * <ul>
- * <li>{@link BaseServicesWrapper}
- * <li>{@link TransactionServicesWrapper}
- * </ul>
  */
 @Path("/")
-public final class ServicesWrapper implements BaseServicesWrapper, TransactionServicesWrapper {
+public final class ServicesWrapper implements RestconfOperationsService, RestconfSchemaService, RestconfService,
+        RestconfDataService, RestconfInvokeOperationsService, RestconfStreamsSubscriptionService {
 
     private final RestconfDataService delegRestconfDataService;
     private final RestconfInvokeOperationsService delegRestconfInvokeOpsService;