From 97726238803b9d5171e206903348724f28a5a58f Mon Sep 17 00:00:00 2001
From: Koen De Groote <kdg.private@gmail.com>
Date: Thu, 3 Aug 2017 13:29:56 +0200
Subject: [PATCH] Added the Serializable interface to classes that
 extend/implement a Comparator with an anonymous/typed class. (#1078)

---
 src/main/java/io/ebeaninternal/server/el/ElComparator.java   | 3 ++-
 .../io/ebeaninternal/server/el/ElComparatorCompound.java     | 2 ++
 .../io/ebeaninternal/server/el/ElComparatorProperty.java     | 2 ++
 .../java/io/ebeaninternal/server/query/OrderVersionDesc.java | 5 ++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/el/ElComparator.java b/src/main/java/io/ebeaninternal/server/el/ElComparator.java
index 5dcd6ead0..993c9696f 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElComparator.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElComparator.java
@@ -1,11 +1,12 @@
 package io.ebeaninternal.server.el;
 
+import java.io.Serializable;
 import java.util.Comparator;
 
 /**
  * Comparator for use with the expression objects.
  */
-public interface ElComparator<T> extends Comparator<T> {
+public interface ElComparator<T> extends Comparator<T>, Serializable {
 
   /**
    * Compare given 2 beans.
diff --git a/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java b/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java
index 390de6d61..dc4dd6eeb 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java
@@ -10,6 +10,8 @@ import java.util.Comparator;
  */
 public final class ElComparatorCompound<T> implements Comparator<T>, ElComparator<T> {
 
+  private static final long serialVersionUID = -1523163475050929750L;
+
   private final ElComparator<T>[] array;
 
   public ElComparatorCompound(ElComparator<T>[] array) {
diff --git a/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java b/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java
index e142850cc..84f188167 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java
@@ -7,6 +7,8 @@ import java.util.Comparator;
  */
 public final class ElComparatorProperty<T> implements Comparator<T>, ElComparator<T> {
 
+  private static final long serialVersionUID = -2735738237263956073L;
+
   private final ElPropertyValue elGetValue;
 
   private final int nullOrder;
diff --git a/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java b/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java
index 2ea46ac3a..e3b99561a 100644
--- a/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java
+++ b/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java
@@ -2,16 +2,19 @@ package io.ebeaninternal.server.query;
 
 import io.ebean.Version;
 
+import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Comparator;
 
 /**
  * Compare Version beans in descending order with nulls last.
  */
-class OrderVersionDesc implements Comparator<Version<?>> {
+class OrderVersionDesc implements Comparator<Version<?>>, Serializable {
 
   static final OrderVersionDesc INSTANCE = new OrderVersionDesc();
 
+  private static final long serialVersionUID = -3681686029998263310L;
+
   @Override
   public int compare(Version<?> o1, Version<?> o2) {