Seal AugmentationPath

Drop the use of InstanceIdentifier, as the method is not used and seal
the interface, making sure it is the marker it was intented to be (I
guess).

Change-Id: I88f47e3eabf37d14078ba5550b9f0ab71783de36
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

Author: rovarga

extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/path/ActionPath.java

@@ -7,16 +7,12 @@
  */
 package org.opendaylight.openflowplugin.extension.api.path;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
 /**
  * Enumerates the extension action paths.
  *
  * @author msunal
  */
 public enum ActionPath implements AugmentationPath {
-
     /**
      * openflowplugin-extension-general.yang.
      * <pre>
@@ -34,7 +30,7 @@ public enum ActionPath implements AugmentationPath {
      *          |  |  |        |        +--rw (action)?
      * </pre>
      */
-    INVENTORY_FLOWNODE_TABLE_WRITE_ACTIONS(null),
+    INVENTORY_FLOWNODE_TABLE_WRITE_ACTIONS,
 
     /**
      * openflowplugin-extension-general.yang.
@@ -54,7 +50,7 @@ public enum ActionPath implements AugmentationPath {
      *
      * </pre>
      */
-    INVENTORY_FLOWNODE_TABLE_APPLY_ACTIONS(null),
+    INVENTORY_FLOWNODE_TABLE_APPLY_ACTIONS,
 
     /**
      * openflowplugin-extension-general.yang.
@@ -72,7 +68,7 @@ public enum ActionPath implements AugmentationPath {
      *    |  |  |        |        +--ro (action)?
      * </pre>
      */
-    FLOWS_STATISTICS_UPDATE_WRITE_ACTIONS(null),
+    FLOWS_STATISTICS_UPDATE_WRITE_ACTIONS,
 
     /**
      * openflowplugin-extension-general.yang.
@@ -90,7 +86,7 @@ public enum ActionPath implements AugmentationPath {
      *    |  |  |        |        +--ro (action)?
      * </pre>
      */
-    FLOWS_STATISTICS_UPDATE_APPLY_ACTIONS(null),
+    FLOWS_STATISTICS_UPDATE_APPLY_ACTIONS,
 
     /**
      * openflowplugin-extension-general.yang.
@@ -105,7 +101,7 @@ public enum ActionPath implements AugmentationPath {
      *    |  |           +--ro (action)?
      * </pre>
      */
-    GROUP_DESC_STATS_UPDATED_BUCKET_ACTION(null),
+    GROUP_DESC_STATS_UPDATED_BUCKET_ACTION,
 
     /**
      * openflowplugin-extension-general.yang.
@@ -123,7 +119,7 @@ public enum ActionPath implements AugmentationPath {
      *    |  |  |        |        +--ro (action)?
      * </pre>
      */
-    FLOWS_STATISTICS_RPC_WRITE_ACTIONS(null),
+    FLOWS_STATISTICS_RPC_WRITE_ACTIONS,
 
     /**
      * openflowplugin-extension-general.yang.
@@ -141,16 +137,5 @@ public enum ActionPath implements AugmentationPath {
      *    |  |  |        |        +--ro (action)?
      * </pre>
      */
-    FLOWS_STATISTICS_RPC_APPLY_ACTIONS(null);
-
-    private final InstanceIdentifier<Extension> iid;
-
-    ActionPath(final InstanceIdentifier<Extension> iid) {
-        this.iid = iid;
-    }
-
-    @Override
-    public final InstanceIdentifier<Extension> getInstanceIdentifier() {
-        return iid;
-    }
+    FLOWS_STATISTICS_RPC_APPLY_ACTIONS;
 }

extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/path/AugmentationPath.java

@@ -7,15 +7,11 @@
  */
 package org.opendaylight.openflowplugin.extension.api.path;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
 /**
  * Interface for an extension augmentation path.
  *
  * @author msunal
  */
-public interface AugmentationPath {
-
-    InstanceIdentifier<Extension> getInstanceIdentifier();
+public sealed interface AugmentationPath permits ActionPath, MatchPath, MessagePath {
+    // nothing else
 }

extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/path/MatchPath.java

@@ -7,16 +7,12 @@
  */
 package org.opendaylight.openflowplugin.extension.api.path;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
 /**
  * Enumerates the match paths.
  *
  * @author msunal
  */
 public enum MatchPath implements AugmentationPath {
-
     /**
      * openflowplugin-extension-general.yang.
      * <pre>
@@ -26,7 +22,7 @@ public enum MatchPath implements AugmentationPath {
      *    |  +--ro match
      * </pre>
      */
-    SWITCH_FLOW_REMOVED_MATCH(null),
+    SWITCH_FLOW_REMOVED_MATCH,
 
     /**
      * openflowplugin-extension-general.yang.
@@ -37,7 +33,7 @@ public enum MatchPath implements AugmentationPath {
      *       +--ro match
      * </pre>
      */
-    PACKET_RECEIVED_MATCH(null),
+    PACKET_RECEIVED_MATCH,
 
     /**
      * openflowplugin-extension-general.yang.
@@ -48,7 +44,7 @@ public enum MatchPath implements AugmentationPath {
      *       +--ro match
      * </pre>
      */
-    PACKET_IN_MESSAGE_MATCH(null),
+    PACKET_IN_MESSAGE_MATCH,
 
     /**
      * openflowplugin-extension-general.yang.
@@ -60,7 +56,7 @@ public enum MatchPath implements AugmentationPath {
      *    |  |  +--ro match
      * </pre>
      */
-    FLOWS_STATISTICS_UPDATE_MATCH(null),
+    FLOWS_STATISTICS_UPDATE_MATCH,
 
     /**
      * openflowplugin-extension-general.yang.
@@ -72,17 +68,5 @@ public enum MatchPath implements AugmentationPath {
      *    |  |  +--ro match
      * </pre>
      */
-    FLOWS_STATISTICS_RPC_MATCH(null);
-
-    private final InstanceIdentifier<Extension> iid;
-
-    MatchPath(InstanceIdentifier<Extension> iid) {
-        this.iid = iid;
-    }
-
-    @Override
-    public final InstanceIdentifier<Extension> getInstanceIdentifier() {
-        return iid;
-    }
-
+    FLOWS_STATISTICS_RPC_MATCH;
 }

extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/path/MessagePath.java

@@ -7,14 +7,10 @@
  */
 package org.opendaylight.openflowplugin.extension.api.path;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
 /**
  * List of augmentation points available for experimenter symmetric message and multipart message.
  */
 public enum MessagePath implements AugmentationPath {
-
     /**
      * <pre>
      * module: sal-experimenter-message.
@@ -23,7 +19,7 @@ public enum MessagePath implements AugmentationPath {
      *    +--ro (experimenter-message-of-choice)?module: sal-flow
      * </pre>
      */
-    MESSAGE_NOTIFICATION(null),
+    MESSAGE_NOTIFICATION,
 
     /**
      * <pre>
@@ -34,16 +30,5 @@ public enum MessagePath implements AugmentationPath {
      *       +--ro (experimenter-message-of-choice)?notifications:
      * </pre>
      */
-    MPMESSAGE_RPC_OUTPUT(null);
-
-    private final InstanceIdentifier<Extension> iid;
-
-    MessagePath(InstanceIdentifier<Extension> iid) {
-        this.iid = iid;
-    }
-
-    @Override
-    public final InstanceIdentifier<Extension> getInstanceIdentifier() {
-        return iid;
-    }
+    MPMESSAGE_RPC_OUTPUT;
 }