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

TSK-1778: fix code smells

This commit is contained in:
ryzheboka 2021-12-17 13:03:12 +01:00 committed by Mustapha Zorgati
parent cbe77ce770
commit b35d766d58
6 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/taskana-common/src/test/java/pro/taskana/common/internal/util/ReflectionUtilTest.java
View File

@ -6,7 +6,7 @@ import java.lang.reflect.Field;
import java.util.List;
import org.junit.jupiter.api.Test;
public class ReflectionUtilTest {
class ReflectionUtilTest {
@Test
void should_RetrieveAllFieldsFromClassAndSuperClass() {

19
lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java
View File

@ -360,7 +360,6 @@ public class ClassificationServiceImpl implements ClassificationService {
private void addClassificationToMasterDomain(ClassificationImpl classification) {
if (!Objects.equals(classification.getDomain(), "")) {
boolean doesExist = true;
ClassificationImpl masterClassification = classification.copy(classification.getKey());
masterClassification.setId(
IdGenerator.generateWithPrefix(IdGenerator.ID_PREFIX_CLASSIFICATION));
@ -375,28 +374,24 @@ public class ClassificationServiceImpl implements ClassificationService {
this.getClassification(masterClassification.getKey(), masterClassification.getDomain());
throw new ClassificationAlreadyExistException(masterClassification);
} catch (ClassificationNotFoundException e) {
doesExist = false;
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(
"Method createClassification: Classification does not "
+ "exist in master domain. Classification {}.",
masterClassification);
}
classificationMapper.insert(masterClassification);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(
"Method createClassification: Classification created in "
+ "master-domain, too. Classification {}.",
masterClassification);
}
} catch (ClassificationAlreadyExistException ex) {
LOGGER.warn(
"Method createClassification: Classification does already exist "
+ "in master domain. Classification {}.",
LogSanitizer.stripLineBreakingChars(masterClassification));
} finally {
if (!doesExist) {
classificationMapper.insert(masterClassification);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(
"Method createClassification: Classification created in "
+ "master-domain, too. Classification {}.",
masterClassification);
}
}
}
}
}

14
lib/taskana-core/src/test/java/acceptance/builder/ClassificationBuilderTest.java
View File

@ -196,13 +196,13 @@ class ClassificationBuilderTest {
private <T> void applyBuilderFunctionAndVerifyValue(
T value,
BiFunction<ClassificationBuilder, T, ClassificationBuilder> builderfunction,
BiFunction<ClassificationBuilder, T, ClassificationBuilder> builderFunction,
Function<Classification, T> retriever)
throws Exception {
ClassificationBuilder builder =
newClassification().domain("DOMAIN_A").key("A" + builderfunction.hashCode());
newClassification().domain("DOMAIN_A").key("A" + builderFunction.hashCode());
builderfunction.apply(builder, value);
builderFunction.apply(builder, value);
Classification classification = builder.buildAndStore(classificationService);
T retrievedValue = retriever.apply(classification);
@ -211,14 +211,14 @@ class ClassificationBuilderTest {
private <T> void applyAndOverrideWithApiDefaultValue(
T value,
BiFunction<ClassificationBuilder, T, ClassificationBuilder> builderfunction,
BiFunction<ClassificationBuilder, T, ClassificationBuilder> builderFunction,
Function<Classification, T> retriever)
throws Exception {
ClassificationBuilder builder =
newClassification().domain("DOMAIN_A").key("B" + builderfunction.hashCode());
newClassification().domain("DOMAIN_A").key("B" + builderFunction.hashCode());
builderfunction.apply(builder, value);
builderfunction.apply(builder, null);
builderFunction.apply(builder, value);
builderFunction.apply(builder, null);
Classification classification = builder.buildAndStore(classificationService);
T retrievedValue = retriever.apply(classification);

10
lib/taskana-core/src/test/java/acceptance/builder/TaskBuilderTest.java
View File

@ -294,7 +294,7 @@ class TaskBuilderTest {
}
private <T> void applyBuilderFunctionAndVerifyValue(
T value, BiFunction<TaskBuilder, T, TaskBuilder> builderfunction, Function<Task, T> retriever)
T value, BiFunction<TaskBuilder, T, TaskBuilder> builderFunction, Function<Task, T> retriever)
throws Exception {
TaskBuilder builder =
newTask()
@ -302,7 +302,7 @@ class TaskBuilderTest {
.classificationSummary(classificationSummary)
.primaryObjRef(defaultTestObjectReference().build());
builderfunction.apply(builder, value);
builderFunction.apply(builder, value);
Task task = builder.buildAndStore(taskService);
T retrievedValue = retriever.apply(task);
@ -310,7 +310,7 @@ class TaskBuilderTest {
}
private <T> void applyAndOverrideWithApiDefaultValue(
T value, BiFunction<TaskBuilder, T, TaskBuilder> builderfunction, Function<Task, T> retriever)
T value, BiFunction<TaskBuilder, T, TaskBuilder> builderFunction, Function<Task, T> retriever)
throws Exception {
TaskBuilder builder =
newTask()
@ -318,8 +318,8 @@ class TaskBuilderTest {
.classificationSummary(classificationSummary)
.primaryObjRef(defaultTestObjectReference().build());
builderfunction.apply(builder, value);
builderfunction.apply(builder, null);
builderFunction.apply(builder, value);
builderFunction.apply(builder, null);
Task task = builder.buildAndStore(taskService);
T retrievedValue = retriever.apply(task);

10
lib/taskana-core/src/test/java/acceptance/builder/TaskCommentBuilderTest.java
View File

@ -169,11 +169,11 @@ class TaskCommentBuilderTest {
private <T> void applyBuilderFunctionAndVerifyValue(
T value,
BiFunction<TaskCommentBuilder, T, TaskCommentBuilder> builderfunction,
BiFunction<TaskCommentBuilder, T, TaskCommentBuilder> builderFunction,
Function<TaskComment, T> retriever)
throws Exception {
TaskCommentBuilder builder = newTaskComment().taskId(task.getId());
builderfunction.apply(builder, value);
builderFunction.apply(builder, value);
TaskComment classification = builder.buildAndStore(taskService);
T retrievedValue = retriever.apply(classification);
@ -182,13 +182,13 @@ class TaskCommentBuilderTest {
private <T> void applyAndOverrideWithApiDefaultValue(
T value,
BiFunction<TaskCommentBuilder, T, TaskCommentBuilder> builderfunction,
BiFunction<TaskCommentBuilder, T, TaskCommentBuilder> builderFunction,
Function<TaskComment, T> retriever)
throws Exception {
TaskCommentBuilder builder = newTaskComment().taskId(task.getId());
builderfunction.apply(builder, value);
builderfunction.apply(builder, null);
builderFunction.apply(builder, value);
builderFunction.apply(builder, null);
TaskComment classification = builder.buildAndStore(taskService);
T retrievedValue = retriever.apply(classification);

14
lib/taskana-core/src/test/java/acceptance/builder/WorkbasketBuilderTest.java
View File

@ -204,7 +204,7 @@ class WorkbasketBuilderTest {
private <T> void applyBuilderFunctionAndVerifyValue(
T value,
BiFunction<WorkbasketBuilder, T, WorkbasketBuilder> builderfunction,
BiFunction<WorkbasketBuilder, T, WorkbasketBuilder> builderFunction,
Function<Workbasket, T> retriever)
throws Exception {
WorkbasketBuilder builder =
@ -212,9 +212,9 @@ class WorkbasketBuilderTest {
.domain("DOMAIN_A")
.name("workbasketName")
.type(WorkbasketType.PERSONAL)
.key("A" + builderfunction.hashCode());
.key("A" + builderFunction.hashCode());
builderfunction.apply(builder, value);
builderFunction.apply(builder, value);
Workbasket classification = builder.buildAndStore(workbasketService);
T retrievedValue = retriever.apply(classification);
@ -223,7 +223,7 @@ class WorkbasketBuilderTest {
private <T> void applyAndOverrideWithApiDefaultValue(
T value,
BiFunction<WorkbasketBuilder, T, WorkbasketBuilder> builderfunction,
BiFunction<WorkbasketBuilder, T, WorkbasketBuilder> builderFunction,
Function<Workbasket, T> retriever)
throws Exception {
WorkbasketBuilder builder =
@ -231,10 +231,10 @@ class WorkbasketBuilderTest {
.domain("DOMAIN_A")
.name("workbasketName")
.type(WorkbasketType.PERSONAL)
.key("B" + builderfunction.hashCode());
.key("B" + builderFunction.hashCode());
builderfunction.apply(builder, value);
builderfunction.apply(builder, null);
builderFunction.apply(builder, value);
builderFunction.apply(builder, null);
Workbasket classification = builder.buildAndStore(workbasketService);
T retrievedValue = retriever.apply(classification);