From 9d4f80dcaa1b3757ff3e362be391edca7a775432 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Mon, 19 Feb 2018 16:16:17 +0100 Subject: [PATCH] TSK-302: removed getAllClassifications --- .../pro/taskana/ClassificationService.java | 15 ------------- .../impl/ClassificationServiceImpl.java | 22 ------------------- .../impl/ClassificationServiceImplTest.java | 22 ------------------- ...ificationServiceImplIntAutoCommitTest.java | 5 +++-- ...ssificationServiceImplIntExplicitTest.java | 4 ++-- 5 files changed, 5 insertions(+), 63 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java b/lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java index fe2eb8c97..50ea003d2 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java +++ b/lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java @@ -1,7 +1,5 @@ package pro.taskana; -import java.util.List; - import pro.taskana.exceptions.ClassificationAlreadyExistException; import pro.taskana.exceptions.ClassificationInUseException; import pro.taskana.exceptions.ClassificationNotFoundException; @@ -12,19 +10,6 @@ import pro.taskana.exceptions.NotAuthorizedException; */ public interface ClassificationService { - - /** - * Get all ClassificationSummaries with the given key. Returns also older and domain-specific versions of the - * classification. - * - * @param key - * the key of the searched-for classifications - * @param domain - * the domain of the searched-for classifications - * @return List with all versions of the Classification - */ - List getAllClassifications(String key, String domain); - /** * Get the Classification for key and domain. If there's no Classification in the given domain, return the * Classification from the root domain. diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java index c95a57dbb..faca5179a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java @@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory; import pro.taskana.Classification; import pro.taskana.ClassificationQuery; import pro.taskana.ClassificationService; -import pro.taskana.ClassificationSummary; import pro.taskana.TaskSummary; import pro.taskana.TaskanaEngine; import pro.taskana.exceptions.ClassificationAlreadyExistException; @@ -21,7 +20,6 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.NotAuthorizedToQueryWorkbasketException; import pro.taskana.exceptions.SystemException; import pro.taskana.impl.util.IdGenerator; -import pro.taskana.impl.util.LoggerUtils; import pro.taskana.mappings.ClassificationMapper; import pro.taskana.mappings.TaskMapper; @@ -196,26 +194,6 @@ public class ClassificationServiceImpl implements ClassificationService { } } - @Override - public List getAllClassifications(String key, String domain) { - LOGGER.debug("entry to getAllClassificationsWithKey(key = {}, domain = {})", key, domain); - List results = new ArrayList<>(); - try { - taskanaEngineImpl.openConnection(); - List classificationSummaries = classificationMapper - .getAllClassificationsWithKey(key, domain); - classificationSummaries.stream().forEach(c -> results.add(c)); - return results; - } finally { - taskanaEngineImpl.returnConnection(); - if (LOGGER.isDebugEnabled()) { - int numberOfResultObjects = results == null ? 0 : results.size(); - LOGGER.debug("exit from getAllClassificationsWithKey(). Returning {} resulting Objects: {} ", - numberOfResultObjects, LoggerUtils.listToString(results)); - } - } - } - @Override public Classification getClassification(String key, String domain) throws ClassificationNotFoundException { if (key == null) { diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java index c045847b8..c860b58f2 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java @@ -13,8 +13,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import java.time.Instant; import java.time.LocalDate; -import java.util.Arrays; -import java.util.List; import org.junit.Before; import org.junit.Test; @@ -25,7 +23,6 @@ import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; import pro.taskana.Classification; -import pro.taskana.ClassificationSummary; import pro.taskana.exceptions.ClassificationAlreadyExistException; import pro.taskana.exceptions.ClassificationNotFoundException; import pro.taskana.exceptions.NotAuthorizedException; @@ -165,25 +162,6 @@ public class ClassificationServiceImplTest { verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock); } - @Test - public void testGetAllClassificationWithId() { - Classification dummyClassification = createDummyClassification(); - List classificationImpls = Arrays.asList(new ClassificationSummaryImpl(), - new ClassificationSummaryImpl()); - doReturn(classificationImpls).when(classificationMapperMock) - .getAllClassificationsWithKey(dummyClassification.getKey(), dummyClassification.getDomain()); - - List actualResults = cutSpy.getAllClassifications(dummyClassification.getKey(), - dummyClassification.getDomain()); - - verify(taskanaEngineImplMock, times(1)).openConnection(); - verify(classificationMapperMock, times(1)).getAllClassificationsWithKey(dummyClassification.getKey(), - dummyClassification.getDomain()); - verify(taskanaEngineImplMock, times(1)).returnConnection(); - verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock); - assertThat(actualResults.size(), equalTo(classificationImpls.size())); - } - @Test public void testGetClassificationFromDomain() throws ClassificationNotFoundException { Classification expectedClassification = createDummyClassification(); diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java index ff6207f83..af3f12b9b 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java @@ -142,8 +142,9 @@ public class ClassificationServiceImplIntAutoCommitTest { assertThat(actualClassification.getKey(), equalTo(key)); assertThat(actualClassification.getDomain(), equalTo(domain + "_2")); assertThat(actualClassification.getId(), startsWith(ID_PREFIX_CLASSIFICATION)); - List rootResults = classificationService.getAllClassifications(key, ""); - assertThat(rootResults.size(), equalTo(1)); + //verify that + Classification rootResults = classificationService.getClassification(key, ""); + assertThat(rootResults, not(equalTo(null))); // invalid serviceLevel try { diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntExplicitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntExplicitTest.java index c7b6aef2e..ad017b1b8 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntExplicitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntExplicitTest.java @@ -151,8 +151,8 @@ public class ClassificationServiceImplIntExplicitTest { assertThat(actualClassification.getKey(), equalTo(key)); assertThat(actualClassification.getDomain(), equalTo(domain + "_2")); assertThat(actualClassification.getId(), startsWith(ID_PREFIX_CLASSIFICATION)); - List rootResults = classificationService.getAllClassifications(key, ""); - assertThat(rootResults.size(), equalTo(1)); + Classification rootResult = classificationService.getClassification(key, ""); + assertThat(rootResult, not(equalTo(null))); // invalid serviceLevel try {