From b8555625eb8c54185914b29cf51bf294c212c6dd Mon Sep 17 00:00:00 2001 From: Aaron Klish Date: Thu, 6 Feb 2020 17:20:35 -0600 Subject: [PATCH] Inspection rework --- .../com/yahoo/elide/core/pagination/PaginationImpl.java | 4 ---- .../com/yahoo/elide/core/PersistenceResourceTestSetup.java | 6 +++--- .../java/com/yahoo/elide/core/PersistentResourceTest.java | 6 +++--- .../ContainerWithPackageShare.java | 2 +- .../ShareableWithPackageShare.java | 2 +- .../Untransferable.java | 2 +- .../{packageshareable => nontransferable}/package-info.java | 2 +- 7 files changed, 10 insertions(+), 14 deletions(-) rename elide-core/src/test/java/example/{packageshareable => nontransferable}/ContainerWithPackageShare.java (97%) rename elide-core/src/test/java/example/{packageshareable => nontransferable}/ShareableWithPackageShare.java (97%) rename elide-core/src/test/java/example/{packageshareable => nontransferable}/Untransferable.java (96%) rename elide-core/src/test/java/example/{packageshareable => nontransferable}/package-info.java (85%) diff --git a/elide-core/src/main/java/com/yahoo/elide/core/pagination/PaginationImpl.java b/elide-core/src/main/java/com/yahoo/elide/core/pagination/PaginationImpl.java index 9f5da8bbbd..d419a8786b 100644 --- a/elide-core/src/main/java/com/yahoo/elide/core/pagination/PaginationImpl.java +++ b/elide-core/src/main/java/com/yahoo/elide/core/pagination/PaginationImpl.java @@ -33,10 +33,6 @@ public class PaginationImpl implements Pagination { */ public enum PaginationKey { offset, number, size, limit, totals } - public static final int DEFAULT_OFFSET = 0; - public static final int DEFAULT_PAGE_LIMIT = 500; - public static final int MAX_PAGE_LIMIT = 10000; - // For specifying which page of records is to be returned in the response public static final String PAGE_NUMBER_KEY = "page[number]"; diff --git a/elide-core/src/test/java/com/yahoo/elide/core/PersistenceResourceTestSetup.java b/elide-core/src/test/java/com/yahoo/elide/core/PersistenceResourceTestSetup.java index 16adcd30d9..7c33c8cc81 100644 --- a/elide-core/src/test/java/com/yahoo/elide/core/PersistenceResourceTestSetup.java +++ b/elide-core/src/test/java/com/yahoo/elide/core/PersistenceResourceTestSetup.java @@ -30,9 +30,9 @@ import example.Publisher; import example.Right; import example.UpdateAndCreate; -import example.packageshareable.ContainerWithPackageShare; -import example.packageshareable.ShareableWithPackageShare; -import example.packageshareable.Untransferable; +import example.nontransferable.ContainerWithPackageShare; +import example.nontransferable.ShareableWithPackageShare; +import example.nontransferable.Untransferable; import nocreate.NoCreateEntity; import java.util.HashSet; diff --git a/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceTest.java b/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceTest.java index b0be7c96c1..8ef91e1cea 100644 --- a/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceTest.java +++ b/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceTest.java @@ -66,9 +66,9 @@ import example.Parent; import example.Right; import example.Shape; -import example.packageshareable.ContainerWithPackageShare; -import example.packageshareable.ShareableWithPackageShare; -import example.packageshareable.Untransferable; +import example.nontransferable.ContainerWithPackageShare; +import example.nontransferable.ShareableWithPackageShare; +import example.nontransferable.Untransferable; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/elide-core/src/test/java/example/packageshareable/ContainerWithPackageShare.java b/elide-core/src/test/java/example/nontransferable/ContainerWithPackageShare.java similarity index 97% rename from elide-core/src/test/java/example/packageshareable/ContainerWithPackageShare.java rename to elide-core/src/test/java/example/nontransferable/ContainerWithPackageShare.java index 462a5d546c..91d01be7f9 100644 --- a/elide-core/src/test/java/example/packageshareable/ContainerWithPackageShare.java +++ b/elide-core/src/test/java/example/nontransferable/ContainerWithPackageShare.java @@ -3,7 +3,7 @@ * Licensed under the Apache License, Version 2.0 * See LICENSE file in project root for terms. */ -package example.packageshareable; +package example.nontransferable; import com.yahoo.elide.annotation.Include; import com.yahoo.elide.annotation.NonTransferable; diff --git a/elide-core/src/test/java/example/packageshareable/ShareableWithPackageShare.java b/elide-core/src/test/java/example/nontransferable/ShareableWithPackageShare.java similarity index 97% rename from elide-core/src/test/java/example/packageshareable/ShareableWithPackageShare.java rename to elide-core/src/test/java/example/nontransferable/ShareableWithPackageShare.java index f9c83a6ed5..9446397842 100644 --- a/elide-core/src/test/java/example/packageshareable/ShareableWithPackageShare.java +++ b/elide-core/src/test/java/example/nontransferable/ShareableWithPackageShare.java @@ -3,7 +3,7 @@ * Licensed under the Apache License, Version 2.0 * See LICENSE file in project root for terms. */ -package example.packageshareable; +package example.nontransferable; import com.yahoo.elide.annotation.Include; import com.yahoo.elide.annotation.NonTransferable; diff --git a/elide-core/src/test/java/example/packageshareable/Untransferable.java b/elide-core/src/test/java/example/nontransferable/Untransferable.java similarity index 96% rename from elide-core/src/test/java/example/packageshareable/Untransferable.java rename to elide-core/src/test/java/example/nontransferable/Untransferable.java index b27adb63d8..67a1d4065a 100644 --- a/elide-core/src/test/java/example/packageshareable/Untransferable.java +++ b/elide-core/src/test/java/example/nontransferable/Untransferable.java @@ -3,7 +3,7 @@ * Licensed under the Apache License, Version 2.0 * See LICENSE file in project root for terms. */ -package example.packageshareable; +package example.nontransferable; import com.yahoo.elide.annotation.Include; diff --git a/elide-core/src/test/java/example/packageshareable/package-info.java b/elide-core/src/test/java/example/nontransferable/package-info.java similarity index 85% rename from elide-core/src/test/java/example/packageshareable/package-info.java rename to elide-core/src/test/java/example/nontransferable/package-info.java index 5d89a64252..536228a162 100644 --- a/elide-core/src/test/java/example/packageshareable/package-info.java +++ b/elide-core/src/test/java/example/nontransferable/package-info.java @@ -4,6 +4,6 @@ * See LICENSE file in project root for terms. */ @NonTransferable -package example.packageshareable; +package example.nontransferable; import com.yahoo.elide.annotation.NonTransferable;