Rename DOMActionProviderServiceExtension

Move the extension marker to its base service, with a cute name of
DOMActionProviderService.Extension.

JIRA: MDSAL-841
Change-Id: I7c2ff3b45c2a31fbb0894304e738d511063728fc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMActionProviderService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMActionProviderService.java
index 45a4f178bec64da2430e2e2334ea43afd57369bc..11ac9ed1566dae3155bebe6439c3c395d16eebc4 100644 (file)
--- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMActionProviderService.java
+++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMActionProviderService.java
@@ -20,7 +20,14 @@ import org.opendaylight.yangtools.concepts.ObjectRegistration;
 @Beta
 @NonNullByDefault
 public interface DOMActionProviderService
-        extends DOMService<DOMActionProviderService, DOMActionProviderServiceExtension> {
+        extends DOMService<DOMActionProviderService, DOMActionProviderService.Extension> {
+    /**
+     * Marker interface for extensions of {@link DOMActionProviderService}.
+     */
+    interface Extension extends DOMService.Extension<DOMActionProviderService, Extension> {
+        // Marker interface
+    }
+
     /**
      * Register an {@link DOMActionImplementation} object with this service, servicing specified action instances.
      *

diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMActionProviderServiceExtension.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMActionProviderServiceExtension.java
deleted file mode 100644 (file)
index 411b9f5..0000000
--- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMActionProviderServiceExtension.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2018 Pantheon Technologies, s.r.o. 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.mdsal.dom.api;
-
-import com.google.common.annotations.Beta;
-import org.eclipse.jdt.annotation.NonNullByDefault;
-
-/**
- * Marker interface for extensions of {@link DOMActionProviderService}.
- */
-@Beta
-@NonNullByDefault
-public interface DOMActionProviderServiceExtension
-    extends DOMService.Extension<DOMActionProviderService, DOMActionProviderServiceExtension> {
-
-}

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMActionProviderService.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMActionProviderService.java
index 3456f149b212e53529d0f6fc56535e51de59e2c5..4272bb52a64ba9b978b5e828bbe9c52fecbe4176 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMActionProviderService.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMActionProviderService.java
@@ -13,13 +13,12 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.mdsal.dom.api.DOMActionImplementation;
 import org.opendaylight.mdsal.dom.api.DOMActionInstance;
 import org.opendaylight.mdsal.dom.api.DOMActionProviderService;
-import org.opendaylight.mdsal.dom.api.DOMActionProviderServiceExtension;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
 
 @Beta
 @NonNullByDefault
 public abstract class ForwardingDOMActionProviderService
-        extends ForwardingDOMService<DOMActionProviderService, DOMActionProviderServiceExtension>
+        extends ForwardingDOMService<DOMActionProviderService, DOMActionProviderService.Extension>
         implements DOMActionProviderService {
     @Override
     public <T extends DOMActionImplementation> ObjectRegistration<T> registerActionImplementation(