diff --git a/ci/test.sh b/ci/test.sh index 039a2a09f..309404216 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -36,8 +36,11 @@ function main { mvn clean install -q -f $REL/../rest/ -B #reinstalling rest because rest-doc is built during tests. mvn clean verify -q -f $REL/../rest/ -B -pl taskana-rest-spring-example -P history.plugin elif [[ "$1" == "H2" && "$2" == "LIB" ]]; then + mvn clean install -q -f $REL/.. -N -B mvn clean install -q -f $REL/../lib/ -B -Dmaven.javadoc.skip elif [[ "$1" == "POSTGRES_10_4" && "$2" == "CORE" ]]; then + mvn clean install -q -f $REL/.. -N -B + mvn clean install -q -f $REL/../lib -N -B mvn clean verify -q -f $REL/../lib/taskana-core -B elif [[ "$1" == "POSTGRES_10_4" && "$2" == "WILDFLY" ]]; then #installing dependencies for rest (since this tests runs in a different cache) diff --git a/lib/pom.xml b/lib/pom.xml index 1fdf83d5a..b26d4263c 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT .. diff --git a/lib/taskana-cdi-example/pom.xml b/lib/taskana-cdi-example/pom.xml index 463271561..bd6e2954c 100644 --- a/lib/taskana-cdi-example/pom.xml +++ b/lib/taskana-cdi-example/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 taskana-cdi-example - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT war ${project.groupId}:${project.artifactId} @@ -11,7 +11,7 @@ pro.taskana taskana-lib-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT .. diff --git a/lib/taskana-cdi/pom.xml b/lib/taskana-cdi/pom.xml index 5688b5b29..2b65a5ac4 100644 --- a/lib/taskana-cdi/pom.xml +++ b/lib/taskana-cdi/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 taskana-cdi - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT ${project.groupId}:${project.artifactId} The helper module to integrate taskana into CDI projects. @@ -10,7 +10,7 @@ pro.taskana taskana-lib-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT .. diff --git a/lib/taskana-core/pom.xml b/lib/taskana-core/pom.xml index 530065a10..95532a317 100644 --- a/lib/taskana-core/pom.xml +++ b/lib/taskana-core/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 taskana-core - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT ${project.groupId}:${project.artifactId} The taskana library to include in your project. @@ -10,7 +10,7 @@ pro.taskana taskana-lib-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT .. diff --git a/lib/taskana-spring-example/pom.xml b/lib/taskana-spring-example/pom.xml index 5014756df..7ede41dee 100644 --- a/lib/taskana-spring-example/pom.xml +++ b/lib/taskana-spring-example/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 taskana-spring-example - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT ${project.groupId}:${project.artifactId} The Taskana Spring sample application. @@ -10,7 +10,7 @@ pro.taskana taskana-lib-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT .. diff --git a/lib/taskana-spring/pom.xml b/lib/taskana-spring/pom.xml index e156f9b21..25ed90191 100644 --- a/lib/taskana-spring/pom.xml +++ b/lib/taskana-spring/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 taskana-spring - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT ${project.groupId}:${project.artifactId} The helper module to integrate taskana into Spring projects. @@ -10,7 +10,7 @@ pro.taskana taskana-lib-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 117286e2c..d29718722 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 pro.taskana taskana-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT pom ${project.groupId}:${project.artifactId} @@ -28,6 +28,7 @@ 1.7.25 20180130 2.9.8 + 1.9.2 2.0.1.Final 4.0.1 diff --git a/rest/pom.xml b/rest/pom.xml index b5d100d30..52ba539c8 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 taskana-rest-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT pom ${project.groupId}:${project.artifactId} @@ -11,7 +11,7 @@ pro.taskana taskana-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT .. diff --git a/rest/taskana-rest-spring-base/pom.xml b/rest/taskana-rest-spring-base/pom.xml index ed45e7ce2..7734faa0c 100644 --- a/rest/taskana-rest-spring-base/pom.xml +++ b/rest/taskana-rest-spring-base/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 taskana-rest-spring-base - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT ${project.groupId}:${project.artifactId} groups the minimum required configuration for a taskana REST APP diff --git a/rest/taskana-rest-spring-example/pom.xml b/rest/taskana-rest-spring-example/pom.xml index 05419b259..3022187dc 100644 --- a/rest/taskana-rest-spring-example/pom.xml +++ b/rest/taskana-rest-spring-example/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 taskana-rest-spring-example - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT ${project.groupId}:${project.artifactId} Demo project for taskana-rest-spring @@ -12,7 +12,7 @@ pro.taskana taskana-rest-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT .. @@ -50,7 +50,7 @@ com.h2database h2 - + com.ibm.db2.jcc db2jcc4 @@ -61,7 +61,7 @@ org.postgresql postgresql - 9.4.1212 + ${version.postgres} org.springframework.boot diff --git a/rest/taskana-rest-spring-test/pom.xml b/rest/taskana-rest-spring-test/pom.xml index fb82e3ea3..9ad039189 100644 --- a/rest/taskana-rest-spring-test/pom.xml +++ b/rest/taskana-rest-spring-test/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 taskana-rest-spring-test - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT ${project.groupId}:${project.artifactId} Exclusive test module. Contains integration tests and build rest-doc. @@ -12,7 +12,7 @@ pro.taskana taskana-rest-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT .. diff --git a/rest/taskana-rest-spring-wildfly-example/pom.xml b/rest/taskana-rest-spring-wildfly-example/pom.xml index 15ae16775..11d8a7b27 100644 --- a/rest/taskana-rest-spring-wildfly-example/pom.xml +++ b/rest/taskana-rest-spring-wildfly-example/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 taskana-rest-spring-wildfly-example - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT war ${project.groupId}:${project.artifactId} @@ -11,7 +11,7 @@ pro.taskana taskana-rest-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT .. diff --git a/rest/taskana-rest-spring/pom.xml b/rest/taskana-rest-spring/pom.xml index c2314c7ac..32819b19c 100644 --- a/rest/taskana-rest-spring/pom.xml +++ b/rest/taskana-rest-spring/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 taskana-rest-spring - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT ${project.groupId}:${project.artifactId} The taskana rest logic. @@ -11,7 +11,7 @@ pro.taskana taskana-rest-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT .. @@ -62,6 +62,16 @@ taskana-spring ${project.version} + + org.springframework + spring-aop + ${version.spring} + + + org.aspectj + aspectjweaver + ${version.aspectjweaver} + @@ -107,19 +117,6 @@ - - org.springframework - spring-aop - ${spring.version} - compile - - - org.aspectj - aspectjweaver - 1.9.2 - compile - - diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AbstractPagingController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AbstractPagingController.java index 5297d5b74..9d92dd11e 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AbstractPagingController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AbstractPagingController.java @@ -48,8 +48,8 @@ public abstract class AbstractPagingController { return pageMetadata; } - protected List getQueryList(BaseQuery query, PageMetadata pageMetadata) { - List resultList; + protected List getQueryList(BaseQuery query, PageMetadata pageMetadata) { + List resultList; if (pageMetadata != null) { resultList = query.listPage((int) pageMetadata.getNumber(), (int) pageMetadata.getSize()); } else { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java index 5d9d9adc5..85ed12db6 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java @@ -96,8 +96,7 @@ public class ClassificationController extends AbstractPagingController { query = applyFilterParams(query, params); PageMetadata pageMetadata = getPageMetadata(params, query); - List classificationSummaries = (List) getQueryList(query, - pageMetadata); + List classificationSummaries = getQueryList(query, pageMetadata); ResponseEntity> response = new ResponseEntity<>( classificationSummaryResourceAssembler.toResources( diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java index 2eb6c9a00..c562fa577 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java @@ -109,7 +109,7 @@ public class TaskController extends AbstractPagingController { query = applySortingParams(query, params); PageMetadata pageMetadata = getPageMetadata(params, query); - List taskSummaries = (List) getQueryList(query, pageMetadata); + List taskSummaries = getQueryList(query, pageMetadata); PagedResources pagedResources = taskSummaryResourceAssembler.toResources(taskSummaries, pageMetadata); diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketAccessItemController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketAccessItemController.java index a9ec5f969..73e48f358 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketAccessItemController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketAccessItemController.java @@ -25,8 +25,8 @@ import pro.taskana.WorkbasketService; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.ldap.LdapClient; -import pro.taskana.rest.resource.WorkbasketAccessItemResourceAssembler; import pro.taskana.rest.resource.WorkbasketAccessItemResource; +import pro.taskana.rest.resource.WorkbasketAccessItemResourceAssembler; /** * Controller for Workbasket access. @@ -79,15 +79,15 @@ public class WorkbasketAccessItemController extends AbstractPagingController { query = applySortingParams(query, params); PagedResources.PageMetadata pageMetadata = getPageMetadata(params, query); - List workbasketAccessItems = (List) getQueryList(query, - pageMetadata); + List workbasketAccessItems = getQueryList(query, pageMetadata); - PagedResources pagedResources = workbasketAccessItemResourceAssembler.toResources( + PagedResources pagedResources = workbasketAccessItemResourceAssembler.toResources( workbasketAccessItems, pageMetadata ); - ResponseEntity> response = new ResponseEntity<>(pagedResources, HttpStatus.OK); + ResponseEntity> response = new ResponseEntity<>(pagedResources, + HttpStatus.OK); if (LOGGER.isDebugEnabled()) { LOGGER.debug("Exit from getWorkbasketAccessItems(), returning {}", response); } diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java index b0d3b9d00..d363af7bf 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java @@ -111,8 +111,8 @@ public class WorkbasketController extends AbstractPagingController { query = applyFilterParams(query, params); PageMetadata pageMetadata = getPageMetadata(params, query); - List workbasketSummaries = (List) getQueryList(query, pageMetadata); - PagedResources pagedResources = workbasketSummaryResourceAssembler.toResources(workbasketSummaries, + List workbasketSummaries = getQueryList(query, pageMetadata); + PagedResources pagedResources = workbasketSummaryResourceAssembler.toResources(workbasketSummaries, pageMetadata); ResponseEntity> response = new ResponseEntity<>(pagedResources, diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AbstractRessourcesAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AbstractRessourcesAssembler.java index 8d3868eea..dbb953673 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AbstractRessourcesAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AbstractRessourcesAssembler.java @@ -1,5 +1,9 @@ package pro.taskana.rest.resource; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + import org.springframework.hateoas.Link; import org.springframework.hateoas.PagedResources; import org.springframework.web.context.request.RequestContextHolder; @@ -7,11 +11,6 @@ import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder; -import javax.servlet.http.HttpServletRequest; -import java.util.Iterator; -import java.util.Map; - - /** * Abstract resources assembler for taskana REST controller with pageable resources. * This method is deprecated, it can be removed after fixing taskana-simple-history references @@ -28,16 +27,11 @@ public abstract class AbstractRessourcesAssembler { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); UriComponentsBuilder baseUri = ServletUriComponentsBuilder.fromServletMapping(request) .path(request.getRequestURI()); - Iterator var2 = request.getParameterMap().entrySet().iterator(); - while (var2.hasNext()) { - Map.Entry entry = (Map.Entry) var2.next(); - String[] var4 = (String[]) entry.getValue(); - int var5 = var4.length; - - for (int var6 = 0; var6 < var5; ++var6) { - String value = var4[var6]; - baseUri.queryParam((String) entry.getKey(), new Object[] {value}); + for (Map.Entry entry : request.getParameterMap().entrySet()) { + String[] var4 = entry.getValue(); + for (String value : var4) { + baseUri.queryParam(entry.getKey(), value); } } @@ -48,19 +42,19 @@ public abstract class AbstractRessourcesAssembler { PagedResources.PageMetadata pageMetadata) { UriComponentsBuilder original = getBuilderForOriginalUri(); pagedResources.add( - (new Link(original.replaceQueryParam("page", new Object[] {1}).toUriString())).withRel("first")); + (new Link(original.replaceQueryParam("page", 1).toUriString())).withRel("first")); pagedResources.add((new Link( - original.replaceQueryParam("page", new Object[] {pageMetadata.getTotalPages()}).toUriString())).withRel( + original.replaceQueryParam("page", pageMetadata.getTotalPages()).toUriString())).withRel( "last")); if (pageMetadata.getNumber() > 1L) { pagedResources.add((new Link( - original.replaceQueryParam("page", new Object[] {pageMetadata.getNumber() - 1L}) + original.replaceQueryParam("page", pageMetadata.getNumber() - 1L) .toUriString())).withRel("prev")); } if (pageMetadata.getNumber() < pageMetadata.getTotalPages()) { pagedResources.add((new Link( - original.replaceQueryParam("page", new Object[] {pageMetadata.getNumber() + 1L}) + original.replaceQueryParam("page", pageMetadata.getNumber() + 1L) .toUriString())).withRel("next")); } diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResource.java index 026adbc1d..de06199e5 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResource.java @@ -84,7 +84,7 @@ public class TaskSummaryResource extends ResourceSupport { this.isTransferred = taskSummary.isTransferred(); this.attachmentSummaryResources = taskSummary.getAttachmentSummaries() .stream() - .map(attachment -> new AttachmentSummaryResource(attachment)) + .map(AttachmentSummaryResource::new) .collect(Collectors.toList()); this.custom1 = taskSummary.getCustomAttribute("1"); this.custom2 = taskSummary.getCustomAttribute("2"); diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResourceAssembler.java index 12bba7220..3864e7e32 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResourceAssembler.java @@ -25,13 +25,12 @@ public class TaskSummaryResourceAssembler @Override public TaskSummaryResource toResource(TaskSummary taskSummary) { - TaskSummaryResource resource = null; + TaskSummaryResource resource; try { resource = new TaskSummaryResource(taskSummary); + return resource; } catch (InvalidArgumentException e) { throw new SystemException("caught unexpected Exception.", e.getCause()); - } finally { - return resource; } } diff --git a/web/pom.xml b/web/pom.xml index 50bec17a9..87f943536 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 taskana-web - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT ${project.groupId}:${project.artifactId} taskana web @@ -10,7 +10,7 @@ pro.taskana taskana-rest-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT ../rest