nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-302: removed getAllClassifications

This commit is contained in:
Mustapha Zorgati 2018-02-19 16:16:17 +01:00 committed by Holger Hagen
parent f51174668b
commit 9d4f80dcaa
5 changed files with 5 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java
View File

@ -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<ClassificationSummary> 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.

22
lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
View File

@ -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<ClassificationSummary> getAllClassifications(String key, String domain) {
LOGGER.debug("entry to getAllClassificationsWithKey(key = {}, domain = {})", key, domain);
List<ClassificationSummary> results = new ArrayList<>();
try {
taskanaEngineImpl.openConnection();
List<ClassificationSummaryImpl> 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) {

22
lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java
View File

@ -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<ClassificationSummary> classificationImpls = Arrays.asList(new ClassificationSummaryImpl(),
new ClassificationSummaryImpl());
doReturn(classificationImpls).when(classificationMapperMock)
.getAllClassificationsWithKey(dummyClassification.getKey(), dummyClassification.getDomain());
List<ClassificationSummary> 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();

5
lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java
View File

@ -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<ClassificationSummary> rootResults = classificationService.getAllClassifications(key, "");
assertThat(rootResults.size(), equalTo(1));
//verify that
Classification rootResults = classificationService.getClassification(key, "");
assertThat(rootResults, not(equalTo(null)));
// invalid serviceLevel
try {

4
lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntExplicitTest.java
View File

@ -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<ClassificationSummary> rootResults = classificationService.getAllClassifications(key, "");
assertThat(rootResults.size(), equalTo(1));
Classification rootResult = classificationService.getClassification(key, "");
assertThat(rootResult, not(equalTo(null)));
// invalid serviceLevel
try {