TSK-1419: Null check for Service Level in classification service
This commit is contained in:
parent
bfa2245bd0
commit
6133b66059
|
|
@ -33,6 +33,7 @@ class CreateHistoryEventOnClassificationsCreationAccTest extends AbstractAccTest
|
||||||
Classification newClassification =
|
Classification newClassification =
|
||||||
classificationService.newClassification("somekey", "DOMAIN_A", "TASK");
|
classificationService.newClassification("somekey", "DOMAIN_A", "TASK");
|
||||||
newClassification.setDescription("some description");
|
newClassification.setDescription("some description");
|
||||||
|
newClassification.setServiceLevel("P1D");
|
||||||
newClassification = classificationService.createClassification(newClassification);
|
newClassification = classificationService.createClassification(newClassification);
|
||||||
|
|
||||||
List<ClassificationHistoryEvent> events =
|
List<ClassificationHistoryEvent> events =
|
||||||
|
|
|
||||||
|
|
@ -421,7 +421,8 @@ public class ClassificationServiceImpl implements ClassificationService {
|
||||||
* Fill missing values and validate classification before saving the classification.
|
* Fill missing values and validate classification before saving the classification.
|
||||||
*
|
*
|
||||||
* @param classification the classification which will be verified.
|
* @param classification the classification which will be verified.
|
||||||
* @throws InvalidArgumentException if the given classification has no key.
|
* @throws InvalidArgumentException if the given classification has no key, the service level is
|
||||||
|
* null, the type is not valid or the category for the provided type is invalid.
|
||||||
*/
|
*/
|
||||||
private void initDefaultClassificationValues(ClassificationImpl classification)
|
private void initDefaultClassificationValues(ClassificationImpl classification)
|
||||||
throws InvalidArgumentException {
|
throws InvalidArgumentException {
|
||||||
|
|
@ -442,7 +443,9 @@ public class ClassificationServiceImpl implements ClassificationService {
|
||||||
classification.setIsValidInDomain(true);
|
classification.setIsValidInDomain(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (classification.getServiceLevel() != null && !"".equals(classification.getServiceLevel())) {
|
if (classification.getServiceLevel() == null) {
|
||||||
|
throw new InvalidArgumentException("Classification Service Level must not be null!");
|
||||||
|
} else if (!classification.getServiceLevel().isEmpty()) {
|
||||||
validateServiceLevel(classification.getServiceLevel());
|
validateServiceLevel(classification.getServiceLevel());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,9 +30,11 @@ class CreateClassificationAccTest extends AbstractAccTest {
|
||||||
@WithAccessId(user = "businessadmin")
|
@WithAccessId(user = "businessadmin")
|
||||||
@Test
|
@Test
|
||||||
void testCreateMasterClassification() throws Exception {
|
void testCreateMasterClassification() throws Exception {
|
||||||
long amountOfClassificationsBefore = CLASSIFICATION_SERVICE.createClassificationQuery().count();
|
final long amountOfClassificationsBefore =
|
||||||
|
CLASSIFICATION_SERVICE.createClassificationQuery().count();
|
||||||
Classification classification = CLASSIFICATION_SERVICE.newClassification("Key0", "", "TASK");
|
Classification classification = CLASSIFICATION_SERVICE.newClassification("Key0", "", "TASK");
|
||||||
classification.setIsValidInDomain(true);
|
classification.setIsValidInDomain(true);
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classification = CLASSIFICATION_SERVICE.createClassification(classification);
|
classification = CLASSIFICATION_SERVICE.createClassification(classification);
|
||||||
|
|
||||||
// check only 1 created
|
// check only 1 created
|
||||||
|
|
@ -57,6 +59,7 @@ class CreateClassificationAccTest extends AbstractAccTest {
|
||||||
Classification classification =
|
Classification classification =
|
||||||
CLASSIFICATION_SERVICE.newClassification("Key1", "DOMAIN_A", "TASK");
|
CLASSIFICATION_SERVICE.newClassification("Key1", "DOMAIN_A", "TASK");
|
||||||
classification.setIsValidInDomain(true);
|
classification.setIsValidInDomain(true);
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classification = CLASSIFICATION_SERVICE.createClassification(classification);
|
classification = CLASSIFICATION_SERVICE.createClassification(classification);
|
||||||
|
|
||||||
// Check returning one is the "original"
|
// Check returning one is the "original"
|
||||||
|
|
@ -98,12 +101,14 @@ class CreateClassificationAccTest extends AbstractAccTest {
|
||||||
@Test
|
@Test
|
||||||
void testCreateClassificationWithExistingMaster() throws Exception {
|
void testCreateClassificationWithExistingMaster() throws Exception {
|
||||||
|
|
||||||
CLASSIFICATION_SERVICE.createClassification(
|
Classification classification = CLASSIFICATION_SERVICE.newClassification("Key0815", "", "TASK");
|
||||||
CLASSIFICATION_SERVICE.newClassification("Key0815", "", "TASK"));
|
classification.setServiceLevel("P1D");
|
||||||
|
CLASSIFICATION_SERVICE.createClassification(classification);
|
||||||
|
|
||||||
long amountOfClassificationsBefore = CLASSIFICATION_SERVICE.createClassificationQuery().count();
|
long amountOfClassificationsBefore = CLASSIFICATION_SERVICE.createClassificationQuery().count();
|
||||||
Classification expected =
|
Classification expected =
|
||||||
CLASSIFICATION_SERVICE.newClassification("Key0815", "DOMAIN_B", "TASK");
|
CLASSIFICATION_SERVICE.newClassification("Key0815", "DOMAIN_B", "TASK");
|
||||||
|
expected.setServiceLevel("P1D");
|
||||||
Classification actual = CLASSIFICATION_SERVICE.createClassification(expected);
|
Classification actual = CLASSIFICATION_SERVICE.createClassification(expected);
|
||||||
long amountOfClassificationsAfter = CLASSIFICATION_SERVICE.createClassificationQuery().count();
|
long amountOfClassificationsAfter = CLASSIFICATION_SERVICE.createClassificationQuery().count();
|
||||||
|
|
||||||
|
|
@ -116,13 +121,16 @@ class CreateClassificationAccTest extends AbstractAccTest {
|
||||||
@Test
|
@Test
|
||||||
void testCreateChildInDomainAndCopyInMaster() throws Exception {
|
void testCreateChildInDomainAndCopyInMaster() throws Exception {
|
||||||
Classification parent = CLASSIFICATION_SERVICE.newClassification("Key0816", "DOMAIN_A", "TASK");
|
Classification parent = CLASSIFICATION_SERVICE.newClassification("Key0816", "DOMAIN_A", "TASK");
|
||||||
|
parent.setServiceLevel("P1D");
|
||||||
Classification actualParent = CLASSIFICATION_SERVICE.createClassification(parent);
|
Classification actualParent = CLASSIFICATION_SERVICE.createClassification(parent);
|
||||||
assertThat(actualParent).isNotNull();
|
assertThat(actualParent).isNotNull();
|
||||||
|
|
||||||
long amountOfClassificationsBefore = CLASSIFICATION_SERVICE.createClassificationQuery().count();
|
final long amountOfClassificationsBefore =
|
||||||
|
CLASSIFICATION_SERVICE.createClassificationQuery().count();
|
||||||
Classification child = CLASSIFICATION_SERVICE.newClassification("Key0817", "DOMAIN_A", "TASK");
|
Classification child = CLASSIFICATION_SERVICE.newClassification("Key0817", "DOMAIN_A", "TASK");
|
||||||
child.setParentId(actualParent.getId());
|
child.setParentId(actualParent.getId());
|
||||||
child.setParentKey(actualParent.getKey());
|
child.setParentKey(actualParent.getKey());
|
||||||
|
child.setServiceLevel("P1D");
|
||||||
Classification actualChild = CLASSIFICATION_SERVICE.createClassification(child);
|
Classification actualChild = CLASSIFICATION_SERVICE.createClassification(child);
|
||||||
long amountOfClassificationsAfter = CLASSIFICATION_SERVICE.createClassificationQuery().count();
|
long amountOfClassificationsAfter = CLASSIFICATION_SERVICE.createClassificationQuery().count();
|
||||||
|
|
||||||
|
|
@ -130,6 +138,33 @@ class CreateClassificationAccTest extends AbstractAccTest {
|
||||||
assertThat(actualChild).isNotNull();
|
assertThat(actualChild).isNotNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@WithAccessId(user = "businessadmin")
|
||||||
|
@Test
|
||||||
|
void should_ThrowException_When_TryingToCreateClassificationWithMissingServiceLevel() {
|
||||||
|
|
||||||
|
Classification classification =
|
||||||
|
CLASSIFICATION_SERVICE.newClassification("someKey", "DOMAIN_A", "TASK");
|
||||||
|
assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification))
|
||||||
|
.isInstanceOf(InvalidArgumentException.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
@WithAccessId(user = "businessadmin")
|
||||||
|
@Test
|
||||||
|
void should_ThrowException_When_TryingToUpdateClassificationWithMissingServiceLevel()
|
||||||
|
throws Exception {
|
||||||
|
|
||||||
|
Classification classification =
|
||||||
|
CLASSIFICATION_SERVICE.newClassification("someKey2", "DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
|
|
||||||
|
Classification createdClassification =
|
||||||
|
CLASSIFICATION_SERVICE.createClassification(classification);
|
||||||
|
|
||||||
|
createdClassification.setServiceLevel(null);
|
||||||
|
assertThatThrownBy(() -> CLASSIFICATION_SERVICE.updateClassification(createdClassification))
|
||||||
|
.isInstanceOf(InvalidArgumentException.class);
|
||||||
|
}
|
||||||
|
|
||||||
@WithAccessId(user = "businessadmin")
|
@WithAccessId(user = "businessadmin")
|
||||||
@Test
|
@Test
|
||||||
void testCreateClassificationWithInvalidValues() {
|
void testCreateClassificationWithInvalidValues() {
|
||||||
|
|
@ -154,6 +189,7 @@ class CreateClassificationAccTest extends AbstractAccTest {
|
||||||
@Test
|
@Test
|
||||||
void testCreateClassificationAlreadyExisting() throws Exception {
|
void testCreateClassificationAlreadyExisting() throws Exception {
|
||||||
Classification classification = CLASSIFICATION_SERVICE.newClassification("Key3", "", "TASK");
|
Classification classification = CLASSIFICATION_SERVICE.newClassification("Key3", "", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
Classification classificationCreated =
|
Classification classificationCreated =
|
||||||
CLASSIFICATION_SERVICE.createClassification(classification);
|
CLASSIFICATION_SERVICE.createClassification(classification);
|
||||||
assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classificationCreated))
|
assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classificationCreated))
|
||||||
|
|
|
||||||
|
|
@ -260,6 +260,7 @@ class UpdateClassificationAccTest extends AbstractAccTest {
|
||||||
|
|
||||||
Classification classification =
|
Classification classification =
|
||||||
classificationService.newClassification("Key=0818", "DOMAIN_A", "TASK");
|
classificationService.newClassification("Key=0818", "DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
Classification created = classificationService.createClassification(classification);
|
Classification created = classificationService.createClassification(classification);
|
||||||
created.setServiceLevel("");
|
created.setServiceLevel("");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -113,9 +113,11 @@ class UpdateObjectsUseUtcTimeStampsAccTest extends AbstractAccTest {
|
||||||
@Test
|
@Test
|
||||||
void testTimestampsOnCreateMasterClassification() throws Exception {
|
void testTimestampsOnCreateMasterClassification() throws Exception {
|
||||||
ClassificationService classificationService = taskanaEngine.getClassificationService();
|
ClassificationService classificationService = taskanaEngine.getClassificationService();
|
||||||
long amountOfClassificationsBefore = classificationService.createClassificationQuery().count();
|
final long amountOfClassificationsBefore =
|
||||||
|
classificationService.createClassificationQuery().count();
|
||||||
Classification classification = classificationService.newClassification("Key0", "", "TASK");
|
Classification classification = classificationService.newClassification("Key0", "", "TASK");
|
||||||
classification.setIsValidInDomain(true);
|
classification.setIsValidInDomain(true);
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classification = classificationService.createClassification(classification);
|
classification = classificationService.createClassification(classification);
|
||||||
|
|
||||||
// check only 1 created
|
// check only 1 created
|
||||||
|
|
|
||||||
|
|
@ -52,11 +52,14 @@ class ClassificationServiceImplIntAutoCommitTest {
|
||||||
@Test
|
@Test
|
||||||
void testFindAllClassifications() throws Exception {
|
void testFindAllClassifications() throws Exception {
|
||||||
Classification classification0 = classificationService.newClassification("TEST1", "", "TASK");
|
Classification classification0 = classificationService.newClassification("TEST1", "", "TASK");
|
||||||
|
classification0.setServiceLevel("P1D");
|
||||||
classificationService.createClassification(classification0);
|
classificationService.createClassification(classification0);
|
||||||
Classification classification1 = classificationService.newClassification("TEST2", "", "TASK");
|
Classification classification1 = classificationService.newClassification("TEST2", "", "TASK");
|
||||||
|
classification1.setServiceLevel("P1D");
|
||||||
classificationService.createClassification(classification1);
|
classificationService.createClassification(classification1);
|
||||||
Classification classification2 = classificationService.newClassification("TEST3", "", "TASK");
|
Classification classification2 = classificationService.newClassification("TEST3", "", "TASK");
|
||||||
classification2.setParentId(classification0.getId());
|
classification2.setParentId(classification0.getId());
|
||||||
|
classification2.setServiceLevel("P1D");
|
||||||
classificationService.createClassification(classification2);
|
classificationService.createClassification(classification2);
|
||||||
|
|
||||||
assertThat(classificationService.createClassificationQuery().list()).hasSize(2 + 1);
|
assertThat(classificationService.createClassificationQuery().list()).hasSize(2 + 1);
|
||||||
|
|
@ -68,6 +71,7 @@ class ClassificationServiceImplIntAutoCommitTest {
|
||||||
Classification classification =
|
Classification classification =
|
||||||
classificationService.newClassification("TEST434", "DOMAIN_A", "TASK");
|
classificationService.newClassification("TEST434", "DOMAIN_A", "TASK");
|
||||||
classification.setDescription("");
|
classification.setDescription("");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classification = classificationService.createClassification(classification);
|
classification = classificationService.createClassification(classification);
|
||||||
classification.setDescription("TEST SOMETHING");
|
classification.setDescription("TEST SOMETHING");
|
||||||
classificationService.updateClassification(classification);
|
classificationService.updateClassification(classification);
|
||||||
|
|
@ -82,6 +86,7 @@ class ClassificationServiceImplIntAutoCommitTest {
|
||||||
void testInsertClassification() throws Exception {
|
void testInsertClassification() throws Exception {
|
||||||
Classification classification =
|
Classification classification =
|
||||||
classificationService.newClassification("TEST1333", "DOMAIN_A", "TASK");
|
classificationService.newClassification("TEST1333", "DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classificationService.createClassification(classification);
|
classificationService.createClassification(classification);
|
||||||
|
|
||||||
List<ClassificationSummary> list =
|
List<ClassificationSummary> list =
|
||||||
|
|
@ -98,6 +103,7 @@ class ClassificationServiceImplIntAutoCommitTest {
|
||||||
void testUpdateClassification() throws Exception {
|
void testUpdateClassification() throws Exception {
|
||||||
Classification classification =
|
Classification classification =
|
||||||
classificationService.newClassification("TEST32451", "DOMAIN_A", "TASK");
|
classificationService.newClassification("TEST32451", "DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classification = classificationService.createClassification(classification);
|
classification = classificationService.createClassification(classification);
|
||||||
classification.setDescription("description");
|
classification.setDescription("description");
|
||||||
classification = classificationService.updateClassification(classification);
|
classification = classificationService.updateClassification(classification);
|
||||||
|
|
@ -119,10 +125,12 @@ class ClassificationServiceImplIntAutoCommitTest {
|
||||||
void testDefaultSettings() throws Exception {
|
void testDefaultSettings() throws Exception {
|
||||||
Classification classification =
|
Classification classification =
|
||||||
classificationService.newClassification("TEST7771", "DOMAIN_A", "TASK");
|
classificationService.newClassification("TEST7771", "DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classification = classificationService.createClassification(classification);
|
classification = classificationService.createClassification(classification);
|
||||||
|
|
||||||
Classification classification1 =
|
Classification classification1 =
|
||||||
classificationService.newClassification("TEST1865", "DOMAIN_A", "TASK");
|
classificationService.newClassification("TEST1865", "DOMAIN_A", "TASK");
|
||||||
|
classification1.setServiceLevel("P1D");
|
||||||
classification1 = classificationService.createClassification(classification1);
|
classification1 = classificationService.createClassification(classification1);
|
||||||
|
|
||||||
classification1.setParentId(classification.getId());
|
classification1.setParentId(classification.getId());
|
||||||
|
|
|
||||||
|
|
@ -70,6 +70,8 @@ class ClassificationServiceImplIntExplicitTest {
|
||||||
(ClassificationImpl) this.createNewClassificationWithUniqueKey("", "TASK");
|
(ClassificationImpl) this.createNewClassificationWithUniqueKey("", "TASK");
|
||||||
expectedClassification.setKey(key);
|
expectedClassification.setKey(key);
|
||||||
expectedClassification.setDomain("DOMAIN_B");
|
expectedClassification.setDomain("DOMAIN_B");
|
||||||
|
expectedClassification.setServiceLevel("P1D");
|
||||||
|
|
||||||
classificationService.createClassification(expectedClassification);
|
classificationService.createClassification(expectedClassification);
|
||||||
connection.commit();
|
connection.commit();
|
||||||
Classification actualClassification =
|
Classification actualClassification =
|
||||||
|
|
@ -106,11 +108,14 @@ class ClassificationServiceImplIntExplicitTest {
|
||||||
try (Connection connection = dataSource.getConnection()) {
|
try (Connection connection = dataSource.getConnection()) {
|
||||||
taskanaEngine.setConnection(connection);
|
taskanaEngine.setConnection(connection);
|
||||||
Classification classification0 = this.createNewClassificationWithUniqueKey("", "TASK");
|
Classification classification0 = this.createNewClassificationWithUniqueKey("", "TASK");
|
||||||
|
classification0.setServiceLevel("P1D");
|
||||||
classificationService.createClassification(classification0);
|
classificationService.createClassification(classification0);
|
||||||
Classification classification1 = this.createNewClassificationWithUniqueKey("", "TASK");
|
Classification classification1 = this.createNewClassificationWithUniqueKey("", "TASK");
|
||||||
|
classification1.setServiceLevel("P1D");
|
||||||
classificationService.createClassification(classification1);
|
classificationService.createClassification(classification1);
|
||||||
Classification classification2 = this.createNewClassificationWithUniqueKey("", "TASK");
|
Classification classification2 = this.createNewClassificationWithUniqueKey("", "TASK");
|
||||||
classification2.setParentId(classification0.getId());
|
classification2.setParentId(classification0.getId());
|
||||||
|
classification2.setServiceLevel("P1D");
|
||||||
classificationService.createClassification(classification2);
|
classificationService.createClassification(classification2);
|
||||||
|
|
||||||
assertThat(classificationService.createClassificationQuery().list()).hasSize(2 + 1);
|
assertThat(classificationService.createClassificationQuery().list()).hasSize(2 + 1);
|
||||||
|
|
@ -124,6 +129,7 @@ class ClassificationServiceImplIntExplicitTest {
|
||||||
try (Connection connection = dataSource.getConnection()) {
|
try (Connection connection = dataSource.getConnection()) {
|
||||||
taskanaEngine.setConnection(connection);
|
taskanaEngine.setConnection(connection);
|
||||||
Classification classification = this.createNewClassificationWithUniqueKey("DOMAIN_A", "TASK");
|
Classification classification = this.createNewClassificationWithUniqueKey("DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
connection.commit();
|
connection.commit();
|
||||||
classification = classificationService.createClassification(classification);
|
classification = classificationService.createClassification(classification);
|
||||||
|
|
||||||
|
|
@ -144,6 +150,7 @@ class ClassificationServiceImplIntExplicitTest {
|
||||||
try (Connection connection = dataSource.getConnection()) {
|
try (Connection connection = dataSource.getConnection()) {
|
||||||
taskanaEngine.setConnection(connection);
|
taskanaEngine.setConnection(connection);
|
||||||
Classification classification = this.createNewClassificationWithUniqueKey("DOMAIN_A", "TASK");
|
Classification classification = this.createNewClassificationWithUniqueKey("DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classificationService.createClassification(classification);
|
classificationService.createClassification(classification);
|
||||||
List<ClassificationSummary> list =
|
List<ClassificationSummary> list =
|
||||||
classificationService
|
classificationService
|
||||||
|
|
@ -161,6 +168,7 @@ class ClassificationServiceImplIntExplicitTest {
|
||||||
taskanaEngine.setConnection(connection);
|
taskanaEngine.setConnection(connection);
|
||||||
Classification classification = this.createNewClassificationWithUniqueKey("DOMAIN_A", "TASK");
|
Classification classification = this.createNewClassificationWithUniqueKey("DOMAIN_A", "TASK");
|
||||||
classification.setDescription("");
|
classification.setDescription("");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classification = classificationService.createClassification(classification);
|
classification = classificationService.createClassification(classification);
|
||||||
classification.setDescription("description");
|
classification.setDescription("description");
|
||||||
classification = classificationService.updateClassification(classification);
|
classification = classificationService.updateClassification(classification);
|
||||||
|
|
@ -190,10 +198,12 @@ class ClassificationServiceImplIntExplicitTest {
|
||||||
try (Connection connection = dataSource.getConnection()) {
|
try (Connection connection = dataSource.getConnection()) {
|
||||||
taskanaEngine.setConnection(connection);
|
taskanaEngine.setConnection(connection);
|
||||||
Classification classification = this.createNewClassificationWithUniqueKey("DOMAIN_A", "TASK");
|
Classification classification = this.createNewClassificationWithUniqueKey("DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classification = classificationService.createClassification(classification);
|
classification = classificationService.createClassification(classification);
|
||||||
|
|
||||||
Classification classification1 =
|
Classification classification1 =
|
||||||
this.createNewClassificationWithUniqueKey("DOMAIN_A", "TASK");
|
this.createNewClassificationWithUniqueKey("DOMAIN_A", "TASK");
|
||||||
|
classification1.setServiceLevel("P1D");
|
||||||
classification1 = classificationService.createClassification(classification1);
|
classification1 = classificationService.createClassification(classification1);
|
||||||
classification1.setParentId(classification.getId());
|
classification1.setParentId(classification.getId());
|
||||||
classification1 = classificationService.updateClassification(classification1);
|
classification1 = classificationService.updateClassification(classification1);
|
||||||
|
|
|
||||||
|
|
@ -87,6 +87,7 @@ class TaskServiceImplIntAutocommitTest {
|
||||||
|
|
||||||
Classification classification =
|
Classification classification =
|
||||||
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
taskanaEngine.getClassificationService().createClassification(classification);
|
taskanaEngine.getClassificationService().createClassification(classification);
|
||||||
|
|
||||||
Task task = taskServiceImpl.newTask(wb.getId());
|
Task task = taskServiceImpl.newTask(wb.getId());
|
||||||
|
|
@ -112,6 +113,7 @@ class TaskServiceImplIntAutocommitTest {
|
||||||
|
|
||||||
Classification classification =
|
Classification classification =
|
||||||
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classification = taskanaEngine.getClassificationService().createClassification(classification);
|
classification = taskanaEngine.getClassificationService().createClassification(classification);
|
||||||
classification =
|
classification =
|
||||||
taskanaEngine
|
taskanaEngine
|
||||||
|
|
@ -140,6 +142,7 @@ class TaskServiceImplIntAutocommitTest {
|
||||||
taskanaEngine.getWorkbasketService().createWorkbasket(wb);
|
taskanaEngine.getWorkbasketService().createWorkbasket(wb);
|
||||||
Classification classification =
|
Classification classification =
|
||||||
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
taskanaEngine.getClassificationService().createClassification(classification);
|
taskanaEngine.getClassificationService().createClassification(classification);
|
||||||
|
|
||||||
Task task = taskServiceImpl.newTask(wb.getKey(), wb.getDomain());
|
Task task = taskServiceImpl.newTask(wb.getKey(), wb.getDomain());
|
||||||
|
|
@ -196,6 +199,7 @@ class TaskServiceImplIntAutocommitTest {
|
||||||
(ClassificationImpl) classificationService.newClassification("KEY", "DOMAIN_A", "TASK");
|
(ClassificationImpl) classificationService.newClassification("KEY", "DOMAIN_A", "TASK");
|
||||||
classification.setCategory("EXTERNAL");
|
classification.setCategory("EXTERNAL");
|
||||||
classification.setName("Transfert-Task Classification");
|
classification.setName("Transfert-Task Classification");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classificationService.createClassification(classification);
|
classificationService.createClassification(classification);
|
||||||
|
|
||||||
// Task which should be transfered
|
// Task which should be transfered
|
||||||
|
|
@ -247,6 +251,7 @@ class TaskServiceImplIntAutocommitTest {
|
||||||
(ClassificationImpl) classificationService.newClassification("KEY", "DOMAIN_A", "TASK");
|
(ClassificationImpl) classificationService.newClassification("KEY", "DOMAIN_A", "TASK");
|
||||||
classification.setCategory("EXTERNAL");
|
classification.setCategory("EXTERNAL");
|
||||||
classification.setName("Transfert-Task Classification");
|
classification.setName("Transfert-Task Classification");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classificationService.createClassification(classification);
|
classificationService.createClassification(classification);
|
||||||
|
|
||||||
WorkbasketImpl wb = (WorkbasketImpl) workbasketService.newWorkbasket("k5", "DOMAIN_A");
|
WorkbasketImpl wb = (WorkbasketImpl) workbasketService.newWorkbasket("k5", "DOMAIN_A");
|
||||||
|
|
@ -325,6 +330,7 @@ class TaskServiceImplIntAutocommitTest {
|
||||||
taskanaEngine.getWorkbasketService().createWorkbasket(wb);
|
taskanaEngine.getWorkbasketService().createWorkbasket(wb);
|
||||||
Classification classification =
|
Classification classification =
|
||||||
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
taskanaEngine.getClassificationService().createClassification(classification);
|
taskanaEngine.getClassificationService().createClassification(classification);
|
||||||
|
|
||||||
Task task = taskServiceImpl.newTask(wb.getId());
|
Task task = taskServiceImpl.newTask(wb.getId());
|
||||||
|
|
|
||||||
|
|
@ -110,6 +110,7 @@ class TaskServiceImplIntExplicitTest {
|
||||||
workbasket.setType(WorkbasketType.GROUP);
|
workbasket.setType(WorkbasketType.GROUP);
|
||||||
final Classification classification =
|
final Classification classification =
|
||||||
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
taskanaEngineImpl.getWorkbasketService().createWorkbasket(workbasket);
|
taskanaEngineImpl.getWorkbasketService().createWorkbasket(workbasket);
|
||||||
|
|
||||||
WorkbasketAccessItem accessItem = workbasketService.newWorkbasketAccessItem("1", "user-1-1");
|
WorkbasketAccessItem accessItem = workbasketService.newWorkbasketAccessItem("1", "user-1-1");
|
||||||
|
|
@ -214,6 +215,7 @@ class TaskServiceImplIntExplicitTest {
|
||||||
workbasket.setName("workbasket");
|
workbasket.setName("workbasket");
|
||||||
Classification classification =
|
Classification classification =
|
||||||
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classificationService.createClassification(classification);
|
classificationService.createClassification(classification);
|
||||||
workbasket.setId("1"); // set id manually for authorization tests
|
workbasket.setId("1"); // set id manually for authorization tests
|
||||||
workbasket.setType(WorkbasketType.GROUP);
|
workbasket.setType(WorkbasketType.GROUP);
|
||||||
|
|
@ -299,6 +301,7 @@ class TaskServiceImplIntExplicitTest {
|
||||||
(ClassificationImpl) classificationService.newClassification("KEY", "DOMAIN_A", "TASK");
|
(ClassificationImpl) classificationService.newClassification("KEY", "DOMAIN_A", "TASK");
|
||||||
classification.setCategory("EXTERNAL");
|
classification.setCategory("EXTERNAL");
|
||||||
classification.setName("Transfert-Task Classification");
|
classification.setName("Transfert-Task Classification");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classificationService.createClassification(classification);
|
classificationService.createClassification(classification);
|
||||||
|
|
||||||
// Task which should be transfered
|
// Task which should be transfered
|
||||||
|
|
@ -358,6 +361,7 @@ class TaskServiceImplIntExplicitTest {
|
||||||
(ClassificationImpl) classificationService.newClassification("KEY", "DOMAIN_A", "TASK");
|
(ClassificationImpl) classificationService.newClassification("KEY", "DOMAIN_A", "TASK");
|
||||||
classification.setCategory("EXTERNAL");
|
classification.setCategory("EXTERNAL");
|
||||||
classification.setName("Transfert-Task Classification");
|
classification.setName("Transfert-Task Classification");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
classificationService.createClassification(classification);
|
classificationService.createClassification(classification);
|
||||||
|
|
||||||
WorkbasketImpl wb = (WorkbasketImpl) workbasketService.newWorkbasket("wbKey1", "DOMAIN_A");
|
WorkbasketImpl wb = (WorkbasketImpl) workbasketService.newWorkbasket("wbKey1", "DOMAIN_A");
|
||||||
|
|
@ -447,6 +451,7 @@ class TaskServiceImplIntExplicitTest {
|
||||||
|
|
||||||
Classification classification =
|
Classification classification =
|
||||||
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
classificationService.newClassification("TEST", "DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
taskanaEngine.getClassificationService().createClassification(classification);
|
taskanaEngine.getClassificationService().createClassification(classification);
|
||||||
|
|
||||||
Task task = taskServiceImpl.newTask(workbasket.getId());
|
Task task = taskServiceImpl.newTask(workbasket.getId());
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,7 @@ public class ExampleBootstrap {
|
||||||
taskanaEngine.getWorkbasketService().createWorkbasket(wb);
|
taskanaEngine.getWorkbasketService().createWorkbasket(wb);
|
||||||
Classification classification =
|
Classification classification =
|
||||||
taskanaEngine.getClassificationService().newClassification("TEST", "DOMAIN_A", "TASK");
|
taskanaEngine.getClassificationService().newClassification("TEST", "DOMAIN_A", "TASK");
|
||||||
|
classification.setServiceLevel("P1D");
|
||||||
taskanaEngine.getClassificationService().createClassification(classification);
|
taskanaEngine.getClassificationService().createClassification(classification);
|
||||||
|
|
||||||
Task task = taskanaEngine.getTaskService().newTask(wb.getId());
|
Task task = taskanaEngine.getTaskService().newTask(wb.getId());
|
||||||
|
|
|
||||||
|
|
@ -123,7 +123,7 @@ class ClassificationControllerIntTest {
|
||||||
String newClassification =
|
String newClassification =
|
||||||
"{\"classificationId\":\"\",\"category\":\"MANUAL\","
|
"{\"classificationId\":\"\",\"category\":\"MANUAL\","
|
||||||
+ "\"domain\":\"DOMAIN_A\",\"key\":\"NEW_CLASS\","
|
+ "\"domain\":\"DOMAIN_A\",\"key\":\"NEW_CLASS\","
|
||||||
+ "\"name\":\"new classification\",\"type\":\"TASK\"}";
|
+ "\"name\":\"new classification\",\"type\":\"TASK\", \"serviceLevel\":\"P1D\"}";
|
||||||
|
|
||||||
ResponseEntity<ClassificationRepresentationModel> responseEntity =
|
ResponseEntity<ClassificationRepresentationModel> responseEntity =
|
||||||
template.exchange(
|
template.exchange(
|
||||||
|
|
@ -138,7 +138,7 @@ class ClassificationControllerIntTest {
|
||||||
newClassification =
|
newClassification =
|
||||||
"{\"classificationId\":\"\",\"category\":\"MANUAL\","
|
"{\"classificationId\":\"\",\"category\":\"MANUAL\","
|
||||||
+ "\"domain\":\"DOMAIN_A\",\"key\":\"NEW_CLASS_2\","
|
+ "\"domain\":\"DOMAIN_A\",\"key\":\"NEW_CLASS_2\","
|
||||||
+ "\"name\":\"new classification\",\"type\":\"TASK\"}";
|
+ "\"name\":\"new classification\",\"type\":\"TASK\", \"serviceLevel\":\"P1D\"}";
|
||||||
|
|
||||||
responseEntity =
|
responseEntity =
|
||||||
template.exchange(
|
template.exchange(
|
||||||
|
|
@ -178,7 +178,7 @@ class ClassificationControllerIntTest {
|
||||||
String newClassification =
|
String newClassification =
|
||||||
"{\"classificationId\":\"\",\"category\":\"MANUAL\","
|
"{\"classificationId\":\"\",\"category\":\"MANUAL\","
|
||||||
+ "\"domain\":\"DOMAIN_B\",\"key\":\"NEW_CLASS_P1\","
|
+ "\"domain\":\"DOMAIN_B\",\"key\":\"NEW_CLASS_P1\","
|
||||||
+ "\"name\":\"new classification\",\"type\":\"TASK\","
|
+ "\"name\":\"new classification\",\"type\":\"TASK\",\"serviceLevel\":\"P1D\","
|
||||||
+ "\"parentId\":\"CLI:200000000000000000000000000000000015\"}";
|
+ "\"parentId\":\"CLI:200000000000000000000000000000000015\"}";
|
||||||
|
|
||||||
ResponseEntity<ClassificationRepresentationModel> responseEntity =
|
ResponseEntity<ClassificationRepresentationModel> responseEntity =
|
||||||
|
|
@ -199,7 +199,7 @@ class ClassificationControllerIntTest {
|
||||||
String newClassification =
|
String newClassification =
|
||||||
"{\"classificationId\":\"\",\"category\":\"MANUAL\",\"domain\":\"DOMAIN_B\","
|
"{\"classificationId\":\"\",\"category\":\"MANUAL\",\"domain\":\"DOMAIN_B\","
|
||||||
+ "\"key\":\"NEW_CLASS_P2\",\"name\":\"new classification\","
|
+ "\"key\":\"NEW_CLASS_P2\",\"name\":\"new classification\","
|
||||||
+ "\"type\":\"TASK\",\"parentKey\":\"T2100\"}";
|
+ "\"type\":\"TASK\",\"parentKey\":\"T2100\",\"serviceLevel\":\"P1D\"}";
|
||||||
|
|
||||||
ResponseEntity<ClassificationRepresentationModel> responseEntity =
|
ResponseEntity<ClassificationRepresentationModel> responseEntity =
|
||||||
template.exchange(
|
template.exchange(
|
||||||
|
|
@ -218,7 +218,7 @@ class ClassificationControllerIntTest {
|
||||||
String newClassification =
|
String newClassification =
|
||||||
"{\"classificationId\":\"\",\"category\":\"MANUAL\",\"domain\":\"DOMAIN_A\","
|
"{\"classificationId\":\"\",\"category\":\"MANUAL\",\"domain\":\"DOMAIN_A\","
|
||||||
+ "\"key\":\"NEW_CLASS_P2\",\"name\":\"new classification\","
|
+ "\"key\":\"NEW_CLASS_P2\",\"name\":\"new classification\","
|
||||||
+ "\"type\":\"TASK\",\"parentKey\":\"T2100\"}";
|
+ "\"type\":\"TASK\",\"parentKey\":\"T2100\",\"serviceLevel\":\"P1D\"}";
|
||||||
|
|
||||||
ResponseEntity<ClassificationRepresentationModel> responseEntity =
|
ResponseEntity<ClassificationRepresentationModel> responseEntity =
|
||||||
template.exchange(
|
template.exchange(
|
||||||
|
|
@ -260,7 +260,7 @@ class ClassificationControllerIntTest {
|
||||||
"{\"classificationId\":\"\",\"category\":\"MANUAL\",\"domain\":\"DOMAIN_B\","
|
"{\"classificationId\":\"\",\"category\":\"MANUAL\",\"domain\":\"DOMAIN_B\","
|
||||||
+ "\"key\":\"NEW_CLASS_P3\",\"name\":\"new classification\","
|
+ "\"key\":\"NEW_CLASS_P3\",\"name\":\"new classification\","
|
||||||
+ "\"type\":\"TASK\",\"parentId\":\"CLI:200000000000000000000000000000000015\","
|
+ "\"type\":\"TASK\",\"parentId\":\"CLI:200000000000000000000000000000000015\","
|
||||||
+ "\"parentKey\":\"T2000\"}";
|
+ "\"parentKey\":\"T2000\",\"serviceLevel\":\"P1D\"}";
|
||||||
|
|
||||||
ThrowingCallable httpCall =
|
ThrowingCallable httpCall =
|
||||||
() -> {
|
() -> {
|
||||||
|
|
@ -282,7 +282,7 @@ class ClassificationControllerIntTest {
|
||||||
String newClassification =
|
String newClassification =
|
||||||
"{\"classificationId\":\"someId\",\"category\":\"MANUAL\","
|
"{\"classificationId\":\"someId\",\"category\":\"MANUAL\","
|
||||||
+ "\"domain\":\"DOMAIN_A\",\"key\":\"NEW_CLASS\","
|
+ "\"domain\":\"DOMAIN_A\",\"key\":\"NEW_CLASS\","
|
||||||
+ "\"name\":\"new classification\",\"type\":\"TASK\"}";
|
+ "\"name\":\"new classification\",\"type\":\"TASK\",\"serviceLevel\":\"P1D\"}";
|
||||||
|
|
||||||
ThrowingCallable httpCall =
|
ThrowingCallable httpCall =
|
||||||
() -> {
|
() -> {
|
||||||
|
|
|
||||||
|
|
@ -409,6 +409,7 @@ class ClassificationDefinitionControllerIntTest {
|
||||||
classificationRepresentationModel.setDomain(domain);
|
classificationRepresentationModel.setDomain(domain);
|
||||||
classificationRepresentationModel.setParentId(parentId);
|
classificationRepresentationModel.setParentId(parentId);
|
||||||
classificationRepresentationModel.setParentKey(parentKey);
|
classificationRepresentationModel.setParentKey(parentKey);
|
||||||
|
classificationRepresentationModel.setServiceLevel("P1D");
|
||||||
return classificationRepresentationModel;
|
return classificationRepresentationModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -300,7 +300,9 @@ class ClassificationControllerRestDocumentation extends BaseRestDocumentation {
|
||||||
RestDocumentationRequestBuilders.post(
|
RestDocumentationRequestBuilders.post(
|
||||||
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS))
|
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS))
|
||||||
.contentType("application/hal+json")
|
.contentType("application/hal+json")
|
||||||
.content("{\"key\":\"Key0815casdgdgh\", \"domain\":\"DOMAIN_B\"}")
|
.content(
|
||||||
|
"{\"key\":\"Key0815casdgdgh\", \"domain\":\"DOMAIN_B\", "
|
||||||
|
+ "\"serviceLevel\":\"P1D\"}")
|
||||||
.header("Authorization", TEAMLEAD_1_CREDENTIALS))
|
.header("Authorization", TEAMLEAD_1_CREDENTIALS))
|
||||||
.andExpect(MockMvcResultMatchers.status().isCreated())
|
.andExpect(MockMvcResultMatchers.status().isCreated())
|
||||||
.andDo(
|
.andDo(
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,8 @@ class ClassificationDefinitionControllerRestDocumentation extends BaseRestDocume
|
||||||
@Test
|
@Test
|
||||||
void importClassificationDefinitions() throws Exception {
|
void importClassificationDefinitions() throws Exception {
|
||||||
String definitionString =
|
String definitionString =
|
||||||
"{\"classifications\":[{\"key\":\"Key0815\", \"domain\":\"DOMAIN_B\"}]}";
|
"{\"classifications\":[{\"key\":\"Key0815\", \"domain\":\"DOMAIN_B\", "
|
||||||
|
+ "\"serviceLevel\":\"P1D\"}]}";
|
||||||
|
|
||||||
this.mockMvc
|
this.mockMvc
|
||||||
.perform(
|
.perform(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue