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

TSK-774 Step3 - fix rebase errors

This commit is contained in:
BerndBreier 2019-01-31 16:46:40 +01:00 committed by Holger Hagen
parent 7388602266
commit e513f4256d
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/taskana-core/src/main/java/pro/taskana/TaskQueryColumnName.java
View File

@ -1,8 +1,5 @@
package pro.taskana; package pro.taskana;
import java.util.Arrays;
import java.util.List;
/** /**
* Enum containing the column names for @see pro.taskana.mappings.QueryMapper#queryTaskColumnValues(pro.taskana.impl.TaskQueryImpl). * Enum containing the column names for @see pro.taskana.mappings.QueryMapper#queryTaskColumnValues(pro.taskana.impl.TaskQueryImpl).
* *
@ -67,10 +64,6 @@ public enum TaskQueryColumnName implements QueryColumnName {
this.name = name; this.name = name;
} }
public static List<TaskQueryColumnName> getAttachmentList() {
return Arrays.asList(A_CLASSIFICATION_ID, A_CLASSIFICATION_KEY, A_CHANNEL, A_REF_VALUE);
}
@Override @Override
public String toString() { public String toString() {
return name; return name;

1
lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java
View File

@ -1017,6 +1017,7 @@ public class TaskQueryImpl implements TaskQuery {
if (columnName.equals(TaskQueryColumnName.CLASSIFICATION_NAME)) { if (columnName.equals(TaskQueryColumnName.CLASSIFICATION_NAME)) {
joinWithClassifications = true; joinWithClassifications = true;
}
if (columnName.equals(TaskQueryColumnName.A_CLASSIFICATION_NAME)) { if (columnName.equals(TaskQueryColumnName.A_CLASSIFICATION_NAME)) {
joinWithAttachmentClassifications = true; joinWithAttachmentClassifications = true;

1
lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java
View File

@ -281,7 +281,6 @@ public class QueryTasksAccTest extends AbstractAccTest {
.count(); .count();
long countAllIds = taskService.createTaskQuery().count(); long countAllIds = taskService.createTaskQuery().count();
assertEquals(countAllIds, countAllExternalIds); assertEquals(countAllIds, countAllExternalIds);
assertEquals(72, countAllExternalIds);
} }
@WithAccessId( @WithAccessId(