[Blazebit#795] revert binary incompatible changes in KeysetPageRequest

Mobe91 · May 9, 2019 · cbfe6ef · cbfe6ef
1 parent cb2bbb0
commit cbfe6ef
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 17 deletions.
diff --git a/...in/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java b/...in/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
@@ -19,6 +19,8 @@
 import com.blazebit.persistence.spring.data.base.query.AbstractCriteriaQueryParameterBinder;
 import com.blazebit.persistence.spring.data.base.query.JpaParameters;
 import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
+import com.blazebit.persistence.spring.data.repository.KeysetPageable;
+import org.springframework.data.domain.Pageable;
 
 /**
  * Concrete version for Spring Data 1.x.
@@ -34,6 +36,11 @@ public CriteriaQueryParameterBinder(JpaParameters parameters, Object[] values, I
 
     @Override
     protected int getOffset() {
-        return getPageable().getOffset();
+        Pageable pageable = getPageable();
+        if (pageable instanceof KeysetPageable) {
+            return ((KeysetPageable) pageable).getIntOffset();
+        } else {
+            return pageable.getOffset();
+        }
     }
 }
diff --git a/...n/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java b/...n/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
@@ -22,6 +22,7 @@
 import com.blazebit.persistence.spring.data.base.query.JpaParameters;
 import com.blazebit.persistence.spring.data.base.query.ParameterBinder;
 import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
+import com.blazebit.persistence.spring.data.repository.KeysetPageable;
 import com.blazebit.persistence.view.EntityViewManager;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.provider.PersistenceProvider;
@@ -62,7 +63,11 @@ protected int getOffset(Pageable pageable) {
         if (pageable == null) {
             return 0;
         }
-        return pageable.getOffset();
+        if (pageable instanceof KeysetPageable) {
+            return ((KeysetPageable) pageable).getIntOffset();
+        } else {
+            return pageable.getOffset();
+        }
     }
 
     @Override

diff --git a/...a/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java b/...a/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
@@ -20,6 +20,7 @@
 import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
 import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
 import com.blazebit.persistence.spring.data.repository.EntityViewSpecificationExecutor;
+import com.blazebit.persistence.spring.data.repository.KeysetPageable;
 import com.blazebit.persistence.view.EntityViewManager;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Pageable;
@@ -66,6 +67,10 @@ public E findById(ID id) {
 
     @Override
     protected int getOffset(Pageable pageable) {
-        return pageable.getOffset();
+        if (pageable instanceof KeysetPageable) {
+            return ((KeysetPageable) pageable).getIntOffset();
+        } else {
+            return pageable.getOffset();
+        }
     }
 }
diff --git a/...in/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java b/...in/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
@@ -19,6 +19,8 @@
 import com.blazebit.persistence.spring.data.base.query.AbstractCriteriaQueryParameterBinder;
 import com.blazebit.persistence.spring.data.base.query.JpaParameters;
 import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
+import com.blazebit.persistence.spring.data.repository.KeysetPageable;
+import org.springframework.data.domain.Pageable;
 
 /**
  * Concrete version for Spring Data 2.x.
@@ -34,6 +36,11 @@ public CriteriaQueryParameterBinder(JpaParameters parameters, Object[] values, I
 
     @Override
     protected int getOffset() {
-        return (int) getPageable().getOffset();
+        Pageable pageable = getPageable();
+        if (pageable instanceof KeysetPageable) {
+            return ((KeysetPageable) pageable).getIntOffset();
+        } else {
+            return (int) pageable.getOffset();
+        }
     }
 }
diff --git a/...n/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java b/...n/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
@@ -22,6 +22,7 @@
 import com.blazebit.persistence.spring.data.base.query.JpaParameters;
 import com.blazebit.persistence.spring.data.base.query.ParameterBinder;
 import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
+import com.blazebit.persistence.spring.data.repository.KeysetPageable;
 import com.blazebit.persistence.view.EntityViewManager;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.provider.PersistenceProvider;
@@ -60,7 +61,11 @@ protected boolean isExists(PartTree tree) {
     @Override
     protected int getOffset(Pageable pageable) {
         if (pageable.isPaged()) {
-            return (int) pageable.getOffset();
+            if (pageable instanceof KeysetPageable) {
+                return ((KeysetPageable) pageable).getIntOffset();
+            } else {
+                return (int) pageable.getOffset();
+            }
         }
         return 0;
     }

diff --git a/...a/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java b/...a/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
@@ -19,6 +19,7 @@
 import com.blazebit.persistence.CriteriaBuilderFactory;
 import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
 import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
+import com.blazebit.persistence.spring.data.repository.KeysetPageable;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import org.springframework.data.domain.Example;
@@ -73,6 +74,10 @@ private Object convert(Optional<Object> optional, Class<?> targetType) {
 
     @Override
     protected int getOffset(Pageable pageable) {
-        return (int) pageable.getOffset();
+        if (pageable instanceof KeysetPageable) {
+            return ((KeysetPageable) pageable).getIntOffset();
+        } else {
+            return (int) pageable.getOffset();
+        }
     }
 }
diff --git a/...in/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java b/...in/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
@@ -19,6 +19,8 @@
 import com.blazebit.persistence.spring.data.base.query.AbstractCriteriaQueryParameterBinder;
 import com.blazebit.persistence.spring.data.base.query.JpaParameters;
 import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
+import com.blazebit.persistence.spring.data.repository.KeysetPageable;
+import org.springframework.data.domain.Pageable;
 
 /**
  * Concrete version for Spring Data 2.x.
@@ -34,6 +36,11 @@ public CriteriaQueryParameterBinder(JpaParameters parameters, Object[] values, I
 
     @Override
     protected int getOffset() {
-        return (int) getPageable().getOffset();
+        Pageable pageable = getPageable();
+        if (pageable instanceof KeysetPageable) {
+            return ((KeysetPageable) pageable).getIntOffset();
+        } else {
+            return (int) pageable.getOffset();
+        }
     }
 }
diff --git a/...n/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java b/...n/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
@@ -22,6 +22,7 @@
 import com.blazebit.persistence.spring.data.base.query.JpaParameters;
 import com.blazebit.persistence.spring.data.base.query.ParameterBinder;
 import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
+import com.blazebit.persistence.spring.data.repository.KeysetPageable;
 import com.blazebit.persistence.view.EntityViewManager;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.provider.PersistenceProvider;
@@ -60,7 +61,11 @@ protected boolean isExists(PartTree tree) {
     @Override
     protected int getOffset(Pageable pageable) {
         if (pageable.isPaged()) {
-            return (int) pageable.getOffset();
+            if (pageable instanceof KeysetPageable) {
+                return ((KeysetPageable) pageable).getIntOffset();
+            } else {
+                return (int) pageable.getOffset();
+            }
         }
         return 0;
     }

diff --git a/...a/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java b/...a/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
@@ -19,6 +19,7 @@
 import com.blazebit.persistence.CriteriaBuilderFactory;
 import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
 import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
+import com.blazebit.persistence.spring.data.repository.KeysetPageable;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import org.springframework.data.domain.Example;
@@ -83,6 +84,10 @@ public void setRepositoryMethodMetadata(CrudMethodMetadata crudMethodMetadata) {
 
     @Override
     protected int getOffset(Pageable pageable) {
-        return (int) pageable.getOffset();
+        if (pageable instanceof KeysetPageable) {
+            return ((KeysetPageable) pageable).getIntOffset();
+        } else {
+            return (int) pageable.getOffset();
+        }
     }
 }
diff --git a/...base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetPageRequest.java b/...base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetPageRequest.java
@@ -30,7 +30,7 @@
 public class KeysetPageRequest extends PageRequest implements KeysetPageable {
 
     private final KeysetPage keysetPage;
-    private final long offset;
+    private final int offset;
 
     /**
      * Construct a page request with an optional keyset page that may be used for keyset pagination.
@@ -79,17 +79,12 @@ public KeysetPageRequest(KeysetPage keysetPage, Sort sort) {
      * @param pageSize   The number of elements per page
      * @since 1.3.0
      */
-    public KeysetPageRequest(KeysetPage keysetPage, Sort sort, long offset, int pageSize) {
-        super((int) (offset / pageSize), pageSize, sort);
+    public KeysetPageRequest(KeysetPage keysetPage, Sort sort, int offset, int pageSize) {
+        super(offset / pageSize, pageSize, sort);
         this.keysetPage = keysetPage;
         this.offset = offset;
     }
 
-    @Override
-    public long getOffset() {
-        return offset;
-    }
-
     @Override
     public int getIntOffset() {
         return (int) offset;