nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1251: upgraded hateoas to 1.1

This commit is contained in:
Christopher Heiting 2020-05-14 13:04:37 +02:00
parent cbe6b6f5ec
commit 7dcd42bd52
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/resource/TaskHistoryEventListResourceAssembler.java
View File

@ -24,32 +24,32 @@ public class TaskHistoryEventListResourceAssembler extends AbstractRessourcesAss
TaskHistoryEventListResource pagedResources = TaskHistoryEventListResource pagedResources =
new TaskHistoryEventListResource(resources, pageMetadata); new TaskHistoryEventListResource(resources, pageMetadata);
pagedResources.add(new Link(this.getOriginal().toUriString()).withSelfRel()); pagedResources.add(Link.of(this.getOriginal().toUriString()).withSelfRel());
if (pageMetadata != null) { if (pageMetadata != null) {
pagedResources.add(linkTo(TaskHistoryEventController.class).withRel("allTaskHistoryEvent")); pagedResources.add(linkTo(TaskHistoryEventController.class).withRel("allTaskHistoryEvent"));
pagedResources.add( pagedResources.add(
new Link(this.getOriginal().replaceQueryParam("page", 1).toUriString()) Link.of(this.getOriginal().replaceQueryParam("page", 1).toUriString())
.withRel(IanaLinkRelations.FIRST)); .withRel(IanaLinkRelations.FIRST));
pagedResources.add( pagedResources.add(
new Link( Link.of(
this.getOriginal() this.getOriginal()
.replaceQueryParam("page", pageMetadata.getTotalPages()) .replaceQueryParam("page", pageMetadata.getTotalPages())
.toUriString()) .toUriString())
.withRel(IanaLinkRelations.LAST)); .withRel(IanaLinkRelations.LAST));
if (pageMetadata.getNumber() > 1) { if (pageMetadata.getNumber() > 1) {
pagedResources.add( pagedResources.add(
new Link( Link.of(
this.getOriginal() this.getOriginal()
.replaceQueryParam("page", pageMetadata.getNumber() - 1) .replaceQueryParam("page", pageMetadata.getNumber() - 1)
.toUriString()) .toUriString())
.withRel(IanaLinkRelations.PREV)); .withRel(IanaLinkRelations.PREV));
} }
if (pageMetadata.getNumber() < pageMetadata.getTotalPages()) { if (pageMetadata.getNumber() < pageMetadata.getTotalPages()) {
pagedResources.add( pagedResources.add(
new Link( Link.of(
this.getOriginal() this.getOriginal()
.replaceQueryParam("page", pageMetadata.getNumber() + 1) .replaceQueryParam("page", pageMetadata.getNumber() + 1)
.toUriString()) .toUriString())
.withRel(IanaLinkRelations.NEXT)); .withRel(IanaLinkRelations.NEXT));
} }
} }

2
pom.xml
View File

@ -57,7 +57,7 @@
<version.spring.boot>2.2.7.RELEASE</version.spring.boot> <version.spring.boot>2.2.7.RELEASE</version.spring.boot>
<version.spring.restdocs>2.0.4.RELEASE</version.spring.restdocs> <version.spring.restdocs>2.0.4.RELEASE</version.spring.restdocs>
<version.spring.mybatis>2.0.4</version.spring.mybatis> <version.spring.mybatis>2.0.4</version.spring.mybatis>
<version.spring.hateos>1.0.5.RELEASE</version.spring.hateos> <version.spring.hateos>1.1.0.RELEASE</version.spring.hateos>
<version.spring.ldap>2.3.3.RELEASE</version.spring.ldap> <version.spring.ldap>2.3.3.RELEASE</version.spring.ldap>
<!-- wildfly dependencies --> <!-- wildfly dependencies -->

10
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AbstractRessourcesAssembler.java
View File

@ -45,21 +45,21 @@ public abstract class AbstractRessourcesAssembler {
PagedResources<?> pagedResources, PageMetadata pageMetadata) { PagedResources<?> pagedResources, PageMetadata pageMetadata) {
UriComponentsBuilder original = getBuilderForOriginalUri(); UriComponentsBuilder original = getBuilderForOriginalUri();
pagedResources.add( pagedResources.add(
(new Link(original.replaceQueryParam("page", 1).toUriString())).withRel("first")); (Link.of(original.replaceQueryParam("page", 1).toUriString())).withRel("first"));
pagedResources.add( pagedResources.add(
(new Link(original.replaceQueryParam("page", pageMetadata.getTotalPages()).toUriString())) (Link.of(original.replaceQueryParam("page", pageMetadata.getTotalPages()).toUriString()))
.withRel("last")); .withRel("last"));
if (pageMetadata.getNumber() > 1L) { if (pageMetadata.getNumber() > 1L) {
pagedResources.add( pagedResources.add(
(new Link( (Link.of(
original.replaceQueryParam("page", pageMetadata.getNumber() - 1L).toUriString())) original.replaceQueryParam("page", pageMetadata.getNumber() - 1L).toUriString()))
.withRel("prev")); .withRel("prev"));
} }
if (pageMetadata.getNumber() < pageMetadata.getTotalPages()) { if (pageMetadata.getNumber() < pageMetadata.getTotalPages()) {
pagedResources.add( pagedResources.add(
(new Link( (Link.of(
original.replaceQueryParam("page", pageMetadata.getNumber() + 1L).toUriString())) original.replaceQueryParam("page", pageMetadata.getNumber() + 1L).toUriString()))
.withRel("next")); .withRel("next"));
} }

12
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/links/PageLinksAspect.java
View File

@ -40,26 +40,26 @@ public class PageLinksAspect {
RepresentationModel<T> resourceSupport = (RepresentationModel<T>) joinPoint.proceed(); RepresentationModel<T> resourceSupport = (RepresentationModel<T>) joinPoint.proceed();
if (page != null) { if (page != null) {
resourceSupport.add( resourceSupport.add(
new Link(original.replaceQueryParam("page", page.getNumber()).toUriString()) Link.of(original.replaceQueryParam("page", page.getNumber()).toUriString())
.withSelfRel()); .withSelfRel());
resourceSupport.add( resourceSupport.add(
new Link(original.replaceQueryParam("page", 1).toUriString()) Link.of(original.replaceQueryParam("page", 1).toUriString())
.withRel(IanaLinkRelations.FIRST)); .withRel(IanaLinkRelations.FIRST));
resourceSupport.add( resourceSupport.add(
new Link(original.replaceQueryParam("page", page.getTotalPages()).toUriString()) Link.of(original.replaceQueryParam("page", page.getTotalPages()).toUriString())
.withRel(IanaLinkRelations.LAST)); .withRel(IanaLinkRelations.LAST));
if (page.getNumber() > 1) { if (page.getNumber() > 1) {
resourceSupport.add( resourceSupport.add(
new Link(original.replaceQueryParam("page", page.getNumber() - 1).toUriString()) Link.of(original.replaceQueryParam("page", page.getNumber() - 1).toUriString())
.withRel(IanaLinkRelations.PREV)); .withRel(IanaLinkRelations.PREV));
} }
if (page.getNumber() < page.getTotalPages()) { if (page.getNumber() < page.getTotalPages()) {
resourceSupport.add( resourceSupport.add(
new Link(original.replaceQueryParam("page", page.getNumber() + 1).toUriString()) Link.of(original.replaceQueryParam("page", page.getNumber() + 1).toUriString())
.withRel(IanaLinkRelations.NEXT)); .withRel(IanaLinkRelations.NEXT));
} }
} else { } else {
resourceSupport.add(new Link(original.toUriString()).withSelfRel()); resourceSupport.add(Link.of(original.toUriString()).withSelfRel());
} }
return resourceSupport; return resourceSupport;
} }