From 3f22104c7cdd72ef51bc89d2e2b2d589d342e30c Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 20 Apr 2011 17:15:42 +0200 Subject: [PATCH] DATACMNS-30 - Made implementations of Page, Pageable and Sort serializable. --- .../main/java/org/springframework/data/domain/PageImpl.java | 5 ++++- .../java/org/springframework/data/domain/PageRequest.java | 6 +++++- .../src/main/java/org/springframework/data/domain/Sort.java | 4 +++- src/main/resources/changelog.txt | 6 ++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/domain/PageImpl.java b/spring-data-commons-core/src/main/java/org/springframework/data/domain/PageImpl.java index fbfd3167c..c5e82cec2 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/domain/PageImpl.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/domain/PageImpl.java @@ -15,6 +15,7 @@ */ package org.springframework.data.domain; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -27,8 +28,10 @@ import java.util.List; * @author Oliver Gierke * @param the type of which the page consists. */ -public class PageImpl implements Page { +public class PageImpl implements Page, Serializable { + private static final long serialVersionUID = 867755909294344406L; + private final List content = new ArrayList(); private final Pageable pageable; private final long total; diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/domain/PageRequest.java b/spring-data-commons-core/src/main/java/org/springframework/data/domain/PageRequest.java index ceee75d59..f4ca5dbec 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/domain/PageRequest.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/domain/PageRequest.java @@ -15,6 +15,8 @@ */ package org.springframework.data.domain; +import java.io.Serializable; + import org.springframework.data.domain.Sort.Direction; @@ -23,8 +25,10 @@ import org.springframework.data.domain.Sort.Direction; * * @author Oliver Gierke */ -public class PageRequest implements Pageable { +public class PageRequest implements Pageable, Serializable { + private static final long serialVersionUID = 8280485938848398236L; + private final int page; private final int size; private final Sort sort; diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/domain/Sort.java b/spring-data-commons-core/src/main/java/org/springframework/data/domain/Sort.java index d300a618a..51ebdeef5 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/domain/Sort.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/domain/Sort.java @@ -15,6 +15,7 @@ */ package org.springframework.data.domain; +import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -32,8 +33,9 @@ import org.springframework.util.StringUtils; * @author Oliver Gierke */ public class Sort implements - Iterable { + Iterable, Serializable { + private static final long serialVersionUID = 5737186511678863905L; public static final Direction DEFAULT_DIRECTION = Direction.ASC; private List orders; diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt index be30766a8..fc8b23c2e 100644 --- a/src/main/resources/changelog.txt +++ b/src/main/resources/changelog.txt @@ -1,6 +1,12 @@ Spring Data Commons Changelog ============================================= +Changes in version 1.0.1 +---------------------------------------- + +General +* Implementations of Page, Pageable and Sort are now serializable (DATACMNS-30) + Changes in version 1.0.0.M6 (2011-03-25) ----------------------------------------