Fix checkstyle

[bgpcep.git] / pcep / spi / src / main / java / org / opendaylight / protocol / pcep / spi / PCEPErrorIdentifier.java

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrorIdentifier.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrorIdentifier.java
index 0871128d239f94c57322cd4b9f1b04fc4d962cb1..592fa9b38ad24719e368a007a811d2ed10d9d32f 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrorIdentifier.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrorIdentifier.java
@@ -7,36 +7,38 @@
  */
 package org.opendaylight.protocol.pcep.spi;
 
+import static java.util.Objects.requireNonNull;
+
 import java.io.Serializable;
+import java.util.Objects;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
  * Caret for combination of Error-type and Error-value.
  */
 final class PCEPErrorIdentifier implements Serializable {
     private static final long serialVersionUID = 2434590156751699872L;
-    private final short type;
-    private final short value;
 
-    PCEPErrorIdentifier(final short type, final short value) {
-        this.type = type;
-        this.value = value;
+    private final @NonNull Uint8 type;
+    private final @NonNull Uint8 value;
+
+    PCEPErrorIdentifier(final Uint8 type, final Uint8 value) {
+        this.type = requireNonNull(type);
+        this.value = requireNonNull(value);
     }
 
-    public short getType() {
-        return this.type;
+    @NonNull Uint8  getType() {
+        return type;
     }
 
-    public short getValue() {
-        return this.value;
+    @NonNull Uint8  getValue() {
+        return value;
     }
 
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + this.type;
-        result = prime * result + this.value;
-        return result;
+        return Objects.hash(type, value);
     }
 
     @Override
@@ -44,11 +46,11 @@ final class PCEPErrorIdentifier implements Serializable {
         if (this == obj) {
             return true;
         }
-        if (obj == null || this.getClass() != obj.getClass()) {
+        if (!(obj instanceof PCEPErrorIdentifier)) {
             return false;
         }
         final PCEPErrorIdentifier other = (PCEPErrorIdentifier) obj;
-        return this.type == other.type && this.value == other.value;
+        return type.equals(other.type) && value.equals(other.value);
     }
 
     @Override