Bump MRI upstreams

[openflowplugin.git] / openflowplugin-api / src / main / java / org / opendaylight / openflowplugin / api / OFConstants.java

diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/OFConstants.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/OFConstants.java
index 78cb45be493abcc23d088eab0788b477b85aab9b..37aac3072444d78034c821f4ace7f058b3cb27b0 100644 (file)
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/OFConstants.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/OFConstants.java
@@ -11,6 +11,7 @@ import java.util.List;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowCookie;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
+import org.opendaylight.yangtools.yang.common.ErrorTag;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint64;
@@ -20,11 +21,6 @@ import org.opendaylight.yangtools.yang.common.Uint8;
  * OFP related constants.
  */
 public final class OFConstants {
-
-    private OFConstants() {
-        throw new UnsupportedOperationException("OF plugin Constants holder class");
-    }
-
     /** enum ofp_port_no, reserved port: process with normal L2/L3 switching.  */
     public static final short OFPP_NORMAL = (short)0xfffa;
     /** enum ofp_port_no, reserved port: all physical ports except input port.  */
@@ -73,13 +69,15 @@ public final class OFConstants {
     public static final int SIGNUM_UNSIGNED = 1;
 
     /** RpcError application tag. */
-    public static final String APPLICATION_TAG = "OPENFLOW_PLUGIN";
-    /** RpcError tag - timeout. */
-    public static final String ERROR_TAG_TIMEOUT = "TIMOUT";
+    public static final ErrorTag APPLICATION_TAG = new ErrorTag("OPENFLOW_PLUGIN");
 
     /** Persistent ID of OpenFlowPlugin configuration file. */
     public static final String CONFIG_FILE_ID = "org.opendaylight.openflowplugin";
 
     /** supported version ordered by height (highest version is at the beginning). */
     public static final List<Uint8> VERSION_ORDER = List.of(OFP_VERSION_1_3, OFP_VERSION_1_0);
+
+    private OFConstants() {
+        // Hidden on purpose
+    }
 }