diff --git a/lib/taskana-core/src/main/java/pro/taskana/BaseQuery.java b/lib/taskana-core/src/main/java/pro/taskana/BaseQuery.java index 425de4bae..829a4a9cc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/BaseQuery.java +++ b/lib/taskana-core/src/main/java/pro/taskana/BaseQuery.java @@ -85,8 +85,31 @@ public interface BaseQuery { * @author bbr */ enum SortDirection { - ASCENDING, - DESCENDING + ASCENDING("ASC"), + DESCENDING("DESC"); + + private final String sortDirection; + + SortDirection(String sortDirection) { + this.sortDirection = sortDirection; + } + + @Override + public String toString() { + return sortDirection; + } + } + + default String[] toUpperCopy(String... source) { + if (source == null || source.length == 0) { + return null; + } else { + String[] target = new String[source.length]; + for (int i = 0; i < source.length; i++) { + target[i] = source[i].toUpperCase(); + } + return target; + } } } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java index 78e042a7b..60960b690 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java @@ -463,10 +463,7 @@ public class ClassificationQueryImpl implements ClassificationQuery { } private ClassificationQuery addOrderCriteria(String columnName, SortDirection sortDirection) { - String orderByDirection = " ASC"; - if (sortDirection != null && SortDirection.DESCENDING.equals(sortDirection)) { - orderByDirection = " DESC"; - } + String orderByDirection = " " + (sortDirection == null ? SortDirection.ASCENDING.toString() : sortDirection.toString()); orderBy.add(columnName + orderByDirection); orderColumns.add(columnName); return this; @@ -620,14 +617,6 @@ public class ClassificationQueryImpl implements ClassificationQuery { return orderColumns; } - private String[] toUpperCopy(String... source) { - String[] target = new String[source.length]; - for (int i = 0; i < source.length; i++) { - target[i] = source[i].toUpperCase(); - } - return target; - } - @Override public String toString() { StringBuilder builder = new StringBuilder(); diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java index 8929aa824..13746971c 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java @@ -211,10 +211,7 @@ public class ObjectReferenceQueryImpl implements ObjectReferenceQuery { } private ObjectReferenceQuery addOrderCriteria(String colName, SortDirection sortDirection) { - String orderByDirection = " ASC"; - if (sortDirection != null && SortDirection.DESCENDING.equals(sortDirection)) { - orderByDirection = " DESC"; - } + String orderByDirection = " " + (sortDirection == null ? SortDirection.ASCENDING.toString() : sortDirection.toString()); orderBy.add(colName + orderByDirection); return this; } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java index bcca23c05..ab94bec9f 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java @@ -1448,23 +1448,12 @@ public class TaskQueryImpl implements TaskQuery { } private TaskQuery addOrderCriteria(String columnName, SortDirection sortDirection) { - String orderByDirection = " ASC"; - if (sortDirection != null && SortDirection.DESCENDING.equals(sortDirection)) { - orderByDirection = " DESC"; - } + String orderByDirection = " " + (sortDirection == null ? SortDirection.ASCENDING.toString() : sortDirection.toString()); orderBy.add(columnName + orderByDirection); orderColumns.add(columnName); return this; } - private String[] toUpperCopy(String... source) { - String[] target = new String[source.length]; - for (int i = 0; i < source.length; i++) { - target[i] = source[i].toUpperCase(); - } - return target; - } - @Override public String toString() { StringBuilder builder = new StringBuilder(); diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemExtendedQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemExtendedQueryImpl.java index 205c37fab..d6ed77afc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemExtendedQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemExtendedQueryImpl.java @@ -250,27 +250,12 @@ public class WorkbasketAccessItemExtendedQueryImpl implements } private WorkbasketAccessItemExtendedQuery addOrderCriteria(String colName, SortDirection sortDirection) { - String orderByDirection = " ASC"; - if (sortDirection != null && SortDirection.DESCENDING.equals(sortDirection)) { - orderByDirection = " DESC"; - } + String orderByDirection = " " + (sortDirection == null ? SortDirection.ASCENDING.toString() : sortDirection.toString()); orderBy.add(colName + orderByDirection); orderColumns.add(colName); return this; } - static String[] toUpperCopy(String... source) { - if (source == null || source.length == 0) { - return null; - } else { - String[] target = new String[source.length]; - for (int i = 0; i < source.length; i++) { - target[i] = source[i].toUpperCase(); - } - return target; - } - } - @Override public String toString() { StringBuilder builder = new StringBuilder(); diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java index 9d7c5709c..274a1e2f9 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java @@ -174,10 +174,7 @@ public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery } private WorkbasketAccessItemQuery addOrderCriteria(String colName, SortDirection sortDirection) { - String orderByDirection = " ASC"; - if (sortDirection != null && SortDirection.DESCENDING.equals(sortDirection)) { - orderByDirection = " DESC"; - } + String orderByDirection = " " + (sortDirection == null ? SortDirection.ASCENDING.toString() : sortDirection.toString()); orderBy.add(colName + orderByDirection); orderColumns.add(colName); return this; diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java index 0946a7d28..7950cf3eb 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java @@ -752,23 +752,8 @@ public class WorkbasketQueryImpl implements WorkbasketQuery { } } - static String[] toUpperCopy(String... source) { - if (source == null || source.length == 0) { - return null; - } else { - String[] target = new String[source.length]; - for (int i = 0; i < source.length; i++) { - target[i] = source[i].toUpperCase(); - } - return target; - } - } - private WorkbasketQuery addOrderCriteria(String colName, SortDirection sortDirection) { - String orderByDirection = " ASC"; - if (sortDirection != null && SortDirection.DESCENDING.equals(sortDirection)) { - orderByDirection = " DESC"; - } + String orderByDirection = " " + (sortDirection == null ? SortDirection.ASCENDING.toString() : sortDirection.toString()); orderBy.add(colName + orderByDirection); orderColumns.add(colName); return this; diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsExtendedAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsExtendedAccTest.java index 3364e0f85..f9b04904b 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsExtendedAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsExtendedAccTest.java @@ -23,9 +23,6 @@ import pro.taskana.security.WithAccessId; @RunWith(JAASRunner.class) public class QueryWorkbasketAccessItemsExtendedAccTest extends AbstractAccTest { - private static SortDirection asc = SortDirection.ASCENDING; - private static SortDirection desc = SortDirection.DESCENDING; - public QueryWorkbasketAccessItemsExtendedAccTest() { super(); } diff --git a/rest/taskana-rest-spring-example/src/main/java/pro/taskana/ldap/LdapCacheTestImpl.java b/rest/taskana-rest-spring-example/src/main/java/pro/taskana/ldap/LdapCacheTestImpl.java index 363bc2cd7..ff4ad4132 100644 --- a/rest/taskana-rest-spring-example/src/main/java/pro/taskana/ldap/LdapCacheTestImpl.java +++ b/rest/taskana-rest-spring-example/src/main/java/pro/taskana/ldap/LdapCacheTestImpl.java @@ -86,11 +86,7 @@ public class LdapCacheTestImpl implements LdapCache { group3.add(group); break; } - if (groupNumber != 3) { - groupNumber++; - } else { - groupNumber = 0; - } + groupNumber = (groupNumber + 1) % 4; } int countUser = 0; @@ -111,11 +107,7 @@ public class LdapCacheTestImpl implements LdapCache { break; } } - if (countUser != 3) { - countUser++; - } else { - countUser = 0; - } + groupNumber = (groupNumber + 1) % 4; } } diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/AccessIdValidationControllerTest.java b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/AccessIdValidationControllerTest.java index 204127abc..2eee3fe5a 100644 --- a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/AccessIdValidationControllerTest.java +++ b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/AccessIdValidationControllerTest.java @@ -32,7 +32,6 @@ import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.ldap.LdapCacheTestImpl; import pro.taskana.rest.resource.AccessIdResource; 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 b18a49279..8890be41e 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 @@ -20,7 +20,7 @@ import pro.taskana.rest.resource.WorkbasketAccesItemExtendedResource; import pro.taskana.rest.resource.assembler.WorkbasketAccessItemExtendedAssembler; import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -147,7 +147,7 @@ public class WorkbasketAccessItemController extends AbstractPagingController { private String[] extractVerticalBarSeparatedFields(List searchFor) { List values = new ArrayList<>(); if (searchFor != null) { - searchFor.forEach(item -> values.addAll(Arrays.asList(item.split("\\|")))); + searchFor.forEach(item -> Collections.addAll(values, item.split("\\|"))); } return values.toArray(new String[0]); } diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/AbstractRessourcesAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/AbstractRessourcesAssembler.java index 4a8dee845..3b27019cb 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/AbstractRessourcesAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/AbstractRessourcesAssembler.java @@ -23,7 +23,7 @@ public abstract class AbstractRessourcesAssembler { original = getBuilderForOriginalUri(); } - protected UriComponentsBuilder getBuilderForOriginalUri() { + protected static UriComponentsBuilder getBuilderForOriginalUri() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) .getRequest(); UriComponentsBuilder baseUri = ServletUriComponentsBuilder.fromServletMapping(request) diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationSummaryResourcesAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationSummaryResourcesAssembler.java index e1fdd5d01..03d5c34b9 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationSummaryResourcesAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationSummaryResourcesAssembler.java @@ -1,24 +1,18 @@ package pro.taskana.rest.resource.assembler; -import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; - -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - import org.springframework.hateoas.Link; import org.springframework.hateoas.PagedResources; import org.springframework.hateoas.PagedResources.PageMetadata; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder; - import pro.taskana.ClassificationSummary; import pro.taskana.rest.ClassificationController; import pro.taskana.rest.resource.ClassificationSummaryResource; +import java.util.List; + +import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; +import static pro.taskana.rest.resource.assembler.AbstractRessourcesAssembler.getBuilderForOriginalUri; + /** * @author HH */ @@ -59,18 +53,4 @@ public class ClassificationSummaryResourcesAssembler { return pagedResources; } - private UriComponentsBuilder getBuilderForOriginalUri() { - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) - .getRequest(); - UriComponentsBuilder baseUri = ServletUriComponentsBuilder.fromServletMapping(request) - .path(request.getRequestURI()); - for (Map.Entry entry : request.getParameterMap().entrySet()) { - for (String value : entry.getValue()) { - baseUri.queryParam(entry.getKey(), value); - } - } - UriComponentsBuilder original = baseUri; - return original; - } - } diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemExtendedAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemExtendedAssembler.java index 51ddad7db..65d342844 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemExtendedAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemExtendedAssembler.java @@ -5,17 +5,14 @@ import org.springframework.hateoas.Link; import org.springframework.hateoas.PagedResources; import org.springframework.hateoas.mvc.ResourceAssemblerSupport; import org.springframework.stereotype.Component; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder; import pro.taskana.WorkbasketAccessItemExtended; import pro.taskana.rest.WorkbasketAccessItemController; import pro.taskana.rest.resource.WorkbasketAccesItemExtendedResource; -import javax.servlet.http.HttpServletRequest; import java.util.List; -import java.util.Map; + +import static pro.taskana.rest.resource.assembler.AbstractRessourcesAssembler.getBuilderForOriginalUri; /** * Transforms {@link WorkbasketAccessItemExtended} to its resource counterpart {@link WorkbasketAccesItemExtendedResource} and vice versa. @@ -71,18 +68,4 @@ public class WorkbasketAccessItemExtendedAssembler extends ResourceAssemblerSupp return pagedResources; } - private UriComponentsBuilder getBuilderForOriginalUri() { - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) - .getRequest(); - UriComponentsBuilder baseUri = ServletUriComponentsBuilder.fromServletMapping(request) - .path(request.getRequestURI()); - for (Map.Entry entry : request.getParameterMap().entrySet()) { - for (String value : entry.getValue()) { - baseUri.queryParam(entry.getKey(), value); - } - } - UriComponentsBuilder original = baseUri; - return original; - } - } diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryResourcesAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryResourcesAssembler.java index d40efafb9..e19a9dad0 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryResourcesAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryResourcesAssembler.java @@ -1,24 +1,18 @@ package pro.taskana.rest.resource.assembler; -import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; - -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - import org.springframework.hateoas.Link; import org.springframework.hateoas.PagedResources; import org.springframework.hateoas.PagedResources.PageMetadata; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder; - import pro.taskana.WorkbasketSummary; import pro.taskana.rest.WorkbasketController; import pro.taskana.rest.resource.WorkbasketSummaryResource; +import java.util.List; + +import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; +import static pro.taskana.rest.resource.assembler.AbstractRessourcesAssembler.getBuilderForOriginalUri; + /** * @author HH */ @@ -58,18 +52,4 @@ public class WorkbasketSummaryResourcesAssembler { return pagedResources; } - private UriComponentsBuilder getBuilderForOriginalUri() { - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) - .getRequest(); - UriComponentsBuilder baseUri = ServletUriComponentsBuilder.fromServletMapping(request) - .path(request.getRequestURI()); - for (Map.Entry entry : request.getParameterMap().entrySet()) { - for (String value : entry.getValue()) { - baseUri.queryParam(entry.getKey(), value); - } - } - UriComponentsBuilder original = baseUri; - return original; - } - } diff --git a/web/src/app/administration/access-items-management/access-items-management.component.html b/web/src/app/administration/access-items-management/access-items-management.component.html index 6293f6a43..fcadb3fb0 100644 --- a/web/src/app/administration/access-items-management/access-items-management.component.html +++ b/web/src/app/administration/access-items-management/access-items-management.component.html @@ -1,7 +1,7 @@
-
diff --git a/web/src/app/administration/access-items-management/access-items-management.component.ts b/web/src/app/administration/access-items-management/access-items-management.component.ts index 3821b33a8..69d789142 100644 --- a/web/src/app/administration/access-items-management/access-items-management.component.ts +++ b/web/src/app/administration/access-items-management/access-items-management.component.ts @@ -138,10 +138,6 @@ export class AccessItemsManagementComponent implements OnInit, OnDestroy { } - revokeAccess() { - - } - private unSubscribe(subscription: Subscription): void { if (subscription) { subscription.unsubscribe(); } }