Eliminate HandlingPriority.CANNOT_HANDLE

[netconf.git] / protocol / netconf-server / src / main / java / org / opendaylight / netconf / server / api / operations / HandlingPriority.java

diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/HandlingPriority.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/HandlingPriority.java
index aa076eb4d672113e376e1bb42ef1f6e08d451918..5fe4adbce7cce39dce46a7d31f716529e4afe620 100644 (file)
--- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/HandlingPriority.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/HandlingPriority.java
@@ -8,67 +8,24 @@
 package org.opendaylight.netconf.server.api.operations;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
 
-import com.google.common.base.MoreObjects;
-import java.util.Objects;
-import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 
-public final class HandlingPriority implements Comparable<HandlingPriority> {
-    // FIXME: remote this constant
-    public static final HandlingPriority CANNOT_HANDLE = new HandlingPriority(null);
-    public static final HandlingPriority HANDLE_WITH_DEFAULT_PRIORITY = new HandlingPriority(Integer.MIN_VALUE);
-    public static final HandlingPriority HANDLE_WITH_MAX_PRIORITY = new HandlingPriority(Integer.MAX_VALUE);
-
-    private final Integer priority;
-
-    private HandlingPriority(final Integer priority) {
-        this.priority = priority;
-    }
-
-    public static @NonNull HandlingPriority of(final int priority) {
-        return new HandlingPriority(priority);
-    }
-
-    /**
-     * Get priority number.
-     *
-     * @return priority number or Optional.absent otherwise
-     */
-    public Optional<Integer> getPriority() {
-        return Optional.ofNullable(priority);
-    }
+public record HandlingPriority(int priority) implements Comparable<HandlingPriority> {
+    public static final @NonNull HandlingPriority HANDLE_WITH_DEFAULT_PRIORITY =
+        new HandlingPriority(Integer.MIN_VALUE);
+    public static final @NonNull HandlingPriority HANDLE_WITH_MAX_PRIORITY = new HandlingPriority(Integer.MAX_VALUE);
 
     public HandlingPriority increasePriority(final int priorityIncrease) {
-        checkState(priority != null, "Unable to increase priority for %s", this);
         checkArgument(priorityIncrease > 0, "Negative increase");
         checkArgument(Long.valueOf(priority) + priorityIncrease < Integer.MAX_VALUE,
                 "Resulting priority cannot be higher than %s", Integer.MAX_VALUE);
-        return of(priority + priorityIncrease);
+        return new HandlingPriority(priority + priorityIncrease);
     }
 
     @Override
     @SuppressWarnings("checkstyle:parameterName")
     public int compareTo(final HandlingPriority o) {
-        if (priority == null) {
-            return o.priority == null ? 0 : -1;
-        }
-        return o.priority == null ? 1 : Integer.compare(priority, o.priority);
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        return this == obj || obj instanceof HandlingPriority other && Objects.equals(priority, other.priority);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(priority) ;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this).add("priority", priority).toString();
+        return Integer.compare(priority, o.priority);
     }
 }