Add comparators

Author: cyrille-leclerc

src/main/java/com/cloudbees/syslog/Facility.java

@@ -17,6 +17,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,7 +28,7 @@
  *
  * @author <a href="mailto:[email protected]">Cyrille Le Clerc</a>
  */
-public enum Facility {
+public enum Facility implements Comparable<Facility> {
 
     /**
      * kernel messages, numerical code 0.
@@ -153,7 +154,7 @@ private Facility(int numericalCode, @Nonnull String label) {
     }
 
     /**
-     * @param label Syslog facility numerical code
+     * @param numericalCode Syslog facility numerical code
      * @return Syslog facility, not {@code null}
      * @throws IllegalArgumentException the given numericalCode is not a valid Syslog facility numerical code
      */
@@ -196,4 +197,16 @@ public int numericalCode() {
     public String label() {
         return label;
     }
+
+    /**
+     * Compare on {@link Facility#numericalCode()}
+     */
+    public static Comparator<Facility> comparator() {
+        return new Comparator<Facility>() {
+            @Override
+            public int compare(Facility f1, Facility f2) {
+                return Integer.compare(f1.numericalCode, f2.numericalCode);
+            }
+        };
+    }
 }

src/main/java/com/cloudbees/syslog/Severity.java

@@ -17,6 +17,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -123,5 +124,17 @@ public int numericalCode() {
     public String label() {
         return label;
     }
+
+    /**
+     * Compare on {@link Severity#numericalCode()}
+     */
+    public static Comparator<Severity> comparator() {
+        return new Comparator<Severity>() {
+            @Override
+            public int compare(Severity s1, Severity s2) {
+                return Integer.compare(s1.numericalCode, s2.numericalCode);
+            }
+        };
+    }
 }
 

src/main/java/com/cloudbees/syslog/integration/jul/util/LevelHelper.java

@@ -36,7 +36,7 @@
 public class LevelHelper {
 
     public final static List<Level> levels = Collections.unmodifiableList(Arrays.asList(Level.OFF, Level.SEVERE, Level.WARNING, Level.INFO, Level.CONFIG,
-            Level.FINE, Level.FINEST, Level.ALL));
+            Level.FINE, Level.FINER, Level.FINEST, Level.ALL));
 
     public final static Map<String, Level> levelsByName;
     public final static Map<Integer, Level> levelsByValue;
@@ -81,4 +81,16 @@ public static Level findLevel(@Nonnull String name) {
     public static Severity toSeverity(@Nullable Level level) {
         return julLevelToSyslogSeverity.get(level);
     }
+
+    /**
+     * Compare on {@link java.util.logging.Level#intValue()}
+     */
+    public static Comparator<Level> comparator() {
+        return new Comparator<Level>() {
+            @Override
+            public int compare(Level l1, Level l2) {
+                return Integer.compare(l1.intValue(), l2.intValue());
+            }
+        };
+    }
 }