From 1f3bd122b85018d28d8c9f53b8b439420dc380e1 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Mon, 6 May 2019 16:33:35 +0200 Subject: [PATCH] TSK-850: reconfigrued taskana-rest-parent and taskana-rest-spring --- pom.xml | 2 + rest/pom.xml | 17 +- rest/taskana-rest-spring/pom.xml | 226 +----------------- .../main/java/pro/taskana/ldap/LdapCache.java | 2 +- .../rest/ClassificationController.java | 2 +- .../java/pro/taskana/rest/TaskController.java | 2 +- .../rest/WorkbasketDefinitionController.java | 6 +- 7 files changed, 29 insertions(+), 228 deletions(-) diff --git a/pom.xml b/pom.xml index cdcce6715..4f43b6dd1 100644 --- a/pom.xml +++ b/pom.xml @@ -14,10 +14,12 @@ 1.8 1.8 UTF-8 + UTF-8 1.7.1 2017.4.0 3.1.2.Final 5.0.5.RELEASE + 2.3.2.RELEASE 2.0.2.RELEASE diff --git a/rest/pom.xml b/rest/pom.xml index aadee1a8a..1e494954b 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -1,16 +1,17 @@ - 4.0.0 - pro.taskana + taskana-rest-parent - 1.1.3-SNAPSHOT + This pom is parent to all taskana rest modules and serves the common build. pom - This pom is parent to all taskana rest modules and serves the common build. - - - 1.8 - + + taskana-parent + pro.taskana + 1.1.2-SNAPSHOT + .. + taskana-rest-spring diff --git a/rest/taskana-rest-spring/pom.xml b/rest/taskana-rest-spring/pom.xml index 7a50b939c..c3e42057d 100644 --- a/rest/taskana-rest-spring/pom.xml +++ b/rest/taskana-rest-spring/pom.xml @@ -2,141 +2,33 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - pro.taskana taskana-rest-spring - 1.1.3-SNAPSHOT ${project.groupId}:${project.artifactId} The taskana rest logic. - http://taskana.pro - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - - Holger Hagen - holger.hagen@novatec-gmbh.de - NovaTec Consulting GmbH - https://www.novatec-gmbh.de - - - - - scm:git:git://github.com/taskana/taskana.git - scm:git:ssh://github.com:taskana/taskana.git - http://github.com/taskana/taskana/tree/master - - - - UTF-8 - UTF-8 - 1.8 - 1.8 - 1.8 - 5.0.5.RELEASE - 2.3.2.RELEASE - - - - - snapshot - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - ossrh - https://oss.sonatype.org/ - false - - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - ossrh - https://oss.sonatype.org/ - false - - - - - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - + + taskana-rest-parent + pro.taskana + 1.1.2-SNAPSHOT + .. + org.springframework spring-web - ${spring.version} + ${version.spring} org.springframework spring-beans - ${spring.version} + ${version.spring} org.springframework spring-jdbc - ${spring.version} + ${version.spring} org.springframework.hateoas @@ -146,7 +38,7 @@ org.springframework.ldap spring-ldap-core - ${spring.ldap.version} + ${version.spring.ldap} javax.servlet @@ -168,7 +60,6 @@ pro.taskana taskana-spring ${project.version} - compile @@ -206,7 +97,7 @@ org.springframework.ldap spring-ldap-test - ${spring.ldap.version} + ${version.spring.ldap} test @@ -230,99 +121,4 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - [1.0.0,) - - check - - - - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - validate - validate - - ../../qa/checkstyle/checkstyle.xml - UTF-8 - true - true - true - true - - - check - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - true - - -Xlint:all - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - attach-javadocs - - jar - - - - - - diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapCache.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapCache.java index 9cbbafd20..b9aa43fc4 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapCache.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapCache.java @@ -33,7 +33,7 @@ public interface LdapCache { /** * Validate a access id. * @param accessId the search string. - * @return the corresponding access id. + * @return the corresponding access ids. */ List validateAccessId(String accessId); } 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 9032ae003..5d9d9adc5 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 @@ -186,7 +186,7 @@ public class ClassificationController extends AbstractPagingController { throws ClassificationNotFoundException, ClassificationInUseException, NotAuthorizedException { LOGGER.debug("Entry to deleteClassification(classificationId= {})", classificationId); classificationService.deleteClassification(classificationId); - ResponseEntity response = new ResponseEntity<>(HttpStatus.NO_CONTENT); + ResponseEntity response = new ResponseEntity<>(HttpStatus.NO_CONTENT); LOGGER.debug("Exit from deleteClassification(), returning {}", response); return response; } 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 4b74b24ed..2eb6c9a00 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 @@ -390,7 +390,7 @@ public class TaskController extends AbstractPagingController { private int[] extractPriorities(String[] prioritiesInString) { if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Entry to extractPriorities(prioritiesInString= {})", prioritiesInString); + LOGGER.debug("Entry to extractPriorities(prioritiesInString= {})", (Object[]) prioritiesInString); } int[] priorities = new int[prioritiesInString.length]; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java index 14a8b0e7d..c8b8a0963 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java @@ -62,7 +62,8 @@ public class WorkbasketDefinitionController { @GetMapping @Transactional(readOnly = true, rollbackFor = Exception.class) - public ResponseEntity> exportWorkbaskets(@RequestParam(required = false) String domain) + public ResponseEntity> exportWorkbaskets( + @RequestParam(required = false) String domain) throws NotAuthorizedException, WorkbasketNotFoundException { LOGGER.debug("Entry to exportWorkbaskets(domain= {})", domain); WorkbasketQuery workbasketQuery = workbasketService.createWorkbasketQuery(); @@ -75,7 +76,8 @@ public class WorkbasketDefinitionController { basketExports.add(workbasketDefinitionAssembler.toResource(workbasket)); } - ResponseEntity> response = new ResponseEntity<>(basketExports, HttpStatus.OK); + ResponseEntity> response = new ResponseEntity<>(basketExports, + HttpStatus.OK); if (LOGGER.isDebugEnabled()) { LOGGER.debug("Exit from exportWorkbaskets(), returning {}", response); }