Skip to content

Commit

Permalink
Updating parent pom version
Browse files Browse the repository at this point in the history
  • Loading branch information
jenga201 committed Jun 10, 2019
1 parent f2d9403 commit 79f3da1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
5 changes: 2 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.1.RELEASE</version>
<version>2.1.5.RELEASE</version>
<relativePath/>
</parent>

Expand Down Expand Up @@ -63,7 +63,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
Expand All @@ -87,6 +86,7 @@
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
Expand All @@ -95,7 +95,6 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>2.23.2</version>
</dependency>
</dependencies>

Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/nibl/api/xdcc/service/PackService.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ public Page<Pack> getBotPacksPaged(Integer botId, Pageable pageable){
Collections.sort(packs, new PackComparator(o.getProperty(), o.getDirection().name()));
}


int start = pageable.getOffset();
int start = (int)pageable.getOffset();
int end = (start + pageable.getPageSize()) > packs.size() ? packs.size() : (start + pageable.getPageSize());
return new PageImpl<Pack>(packs.subList(start, end), pageable, packs.size());
}
Expand Down Expand Up @@ -85,7 +84,7 @@ public Page<Pack> searchPacksPaged(String query, Integer episodeNumber, Pageable
}


int start = pageable.getOffset();
int start = (int)pageable.getOffset();
int end = (start + pageable.getPageSize()) > packs.size() ? packs.size() : (start + pageable.getPageSize());
return new PageImpl<Pack>(packs.subList(start, end), pageable, packs.size());
}
Expand Down Expand Up @@ -123,7 +122,7 @@ public Page<Pack> searchBotPacksPaged(Integer botId, String query, Integer episo
}


int start = pageable.getOffset();
int start = (int)pageable.getOffset();
int end = (start + pageable.getPageSize()) > packs.size() ? packs.size() : (start + pageable.getPageSize());
return new PageImpl<Pack>(packs.subList(start, end), pageable, packs.size());
}
Expand Down

0 comments on commit 79f3da1

Please sign in to comment.