Remove pageSize from RestSessionCollection

treasure-data · Aug 26, 2019 · 2fecfdf · 2fecfdf
1 parent ff63080
commit 2fecfdf
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/digdag-client/src/main/java/io/digdag/client/api/RestSessionCollection.java b/digdag-client/src/main/java/io/digdag/client/api/RestSessionCollection.java
@@ -12,8 +12,6 @@ public interface RestSessionCollection
 
     int getRecordsNumber();
 
-    int getPageSize();
-
     static ImmutableRestSessionCollection.Builder builder()
     {
         return ImmutableRestSessionCollection.builder();

diff --git a/digdag-server/src/main/java/io/digdag/server/rs/ProjectResource.java b/digdag-server/src/main/java/io/digdag/server/rs/ProjectResource.java
@@ -438,7 +438,7 @@ public RestSessionCollection getSessions(
                 sessions = ss.getSessionsOfProject(proj.getId(), validPageSize, Optional.fromNullable(lastId), page);
             }
 
-            return RestModels.sessionCollection(ps, sessions, sessionRecordsNumber, validPageSize);
+            return RestModels.sessionCollection(ps, sessions, sessionRecordsNumber);
         }, ResourceNotFoundException.class);
     }
 

diff --git a/digdag-server/src/main/java/io/digdag/server/rs/RestModels.java b/digdag-server/src/main/java/io/digdag/server/rs/RestModels.java
@@ -245,7 +245,7 @@ public static RestSession session(StoredSessionWithLastAttempt session, String p
     }
 
     static RestSessionCollection sessionCollection(
-            ProjectStore ps, List<StoredSessionWithLastAttempt> sessions, int recordsNumber, int pageSize)
+            ProjectStore ps, List<StoredSessionWithLastAttempt> sessions, int recordsNumber)
     {
         ProjectMap projs = ps.getProjectsByIdList(
                 sessions.stream()
@@ -268,7 +268,6 @@ static RestSessionCollection sessionCollection(
         return RestSessionCollection.builder()
             .sessions(collection)
             .recordsNumber(recordsNumber)
-            .pageSize(pageSize)
             .build();
     }
 

diff --git a/digdag-server/src/main/java/io/digdag/server/rs/SessionResource.java b/digdag-server/src/main/java/io/digdag/server/rs/SessionResource.java
@@ -78,7 +78,7 @@ public RestSessionCollection getSessions(
 
             Integer page = Optional.fromNullable(pageNumber).or(1);
             List<StoredSessionWithLastAttempt> sessions = ss.getSessions(validPageSize, Optional.fromNullable(lastId), page);
-            return RestModels.sessionCollection(rs, sessions, sessionRecordsNumber, validPageSize);
+            return RestModels.sessionCollection(rs, sessions, sessionRecordsNumber);
         });
     }