From 42e6c9bb47127829711adf3ac21aa104efb943d8 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Wed, 15 Mar 2023 11:02:59 +0100 Subject: [PATCH] fixed documentation smoke tests --- ci/verify_docs_alive.sh | 2 +- ci/verify_docs_jar.sh | 5 ++++- .../java/pro/taskana/spi/history/api/TaskanaHistory.java | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ci/verify_docs_alive.sh b/ci/verify_docs_alive.sh index 04a06b99b..a06a8387d 100755 --- a/ci/verify_docs_alive.sh +++ b/ci/verify_docs_alive.sh @@ -7,7 +7,7 @@ test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null "$BASE_URL/docs/rest/rest-a test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null "$BASE_URL/docs/rest/simplehistory-rest-api.html")" test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null "$BASE_URL/docs/rest/routing-rest-api.html")" for module in taskana-core taskana-spring; do - test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null "$BASE_URL/docs/java/$module/pro/taskana/package-summary.html")" + test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null "$BASE_URL/docs/java/$module/index.html")" done for module in taskana-cdi; do test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null "$BASE_URL/docs/java/$module/pro/taskana/common/internal/package-summary.html")" diff --git a/ci/verify_docs_jar.sh b/ci/verify_docs_jar.sh index 662e2fa99..c794aaa81 100755 --- a/ci/verify_docs_jar.sh +++ b/ci/verify_docs_jar.sh @@ -12,12 +12,15 @@ JAR_FILE_LOCATION="$REL/../rest/taskana-rest-spring-example-boot/target/taskana- set -x test -e "$JAR_FILE_LOCATION" set +x -JAR_CONTENT=$(jar tf "$JAR_FILE_LOCATION") +JAR_CONTENT=$(jar -tf "$JAR_FILE_LOCATION") set -x verifyDocs "$REL/../lib/taskana-core/target/apidocs" "/static/docs/java/taskana-core" verifyDocs "$REL/../lib/taskana-cdi/target/apidocs" "/static/docs/java/taskana-cdi" verifyDocs "$REL/../lib/taskana-spring/target/apidocs" "/static/docs/java/taskana-spring" +test -n "$(jar -tf "$JAR_FILE_LOCATION" | grep /static/docs/java/taskana-core/index.html)" +test -n "$(jar -tf "$JAR_FILE_LOCATION" | grep /static/docs/java/taskana-spring/index.html)" +test -n "$(jar -tf "$JAR_FILE_LOCATION" | grep /static/docs/java/taskana-cdi/pro/taskana/common/internal/package-summary.html)" test -n "$(jar -tf "$JAR_FILE_LOCATION" | grep /static/docs/rest/rest-api.html)" test -n "$(jar -tf "$JAR_FILE_LOCATION" | grep /static/docs/rest/simplehistory-rest-api.html)" test -n "$(jar -tf "$JAR_FILE_LOCATION" | grep /static/docs/rest/routing-rest-api.html)" diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/TaskanaHistory.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/TaskanaHistory.java index 5217bb5fd..803598c2b 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/TaskanaHistory.java +++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/TaskanaHistory.java @@ -2,7 +2,6 @@ package pro.taskana.spi.history.api; import java.util.List; import pro.taskana.common.api.TaskanaEngine; -import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent; @@ -46,7 +45,7 @@ public interface TaskanaHistory { * @param taskIds the task ids for which all history events must be deleted * @throws InvalidArgumentException If the list of taskIds is null * @throws NotAuthorizedException if the current user is not member of {@linkplain - * TaskanaRole#ADMIN} + * pro.taskana.common.api.TaskanaRole#ADMIN} */ void deleteHistoryEventsByTaskIds(List taskIds) throws InvalidArgumentException, NotAuthorizedException;