diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/AbstractWorkbasketAccessItemQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/AbstractWorkbasketAccessItemQueryImpl.java index f6a6cb059..72e546b7a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/AbstractWorkbasketAccessItemQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/AbstractWorkbasketAccessItemQueryImpl.java @@ -206,13 +206,6 @@ abstract class AbstractWorkbasketAccessItemQueryImpl< return columnName; } - @SuppressWarnings("checkstyle:MethodName") - abstract Q _this(); - - abstract String getLinkToMapper(); - - abstract String getLinkToValueMapper(); - protected Q addOrderCriteria(String colName, SortDirection sortDirection) { String orderByDirection = " " + (sortDirection == null ? SortDirection.ASCENDING : sortDirection); @@ -221,6 +214,13 @@ abstract class AbstractWorkbasketAccessItemQueryImpl< return _this(); } + @SuppressWarnings("checkstyle:MethodName") + abstract Q _this(); + + abstract String getLinkToMapper(); + + abstract String getLinkToValueMapper(); + @Override public String toString() { return "AbstractWorkbasketAccessItemQueryImpl [" diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationImpl.java index ca8ef49ef..f03004655 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationImpl.java @@ -115,6 +115,16 @@ public class ClassificationImpl extends ClassificationSummaryImpl implements Cla return summary; } + protected boolean canEqual(Object other) { + return (other instanceof ClassificationImpl); + } + + @Override + public int hashCode() { + return Objects.hash( + super.hashCode(), isValidInDomain, created, modified, description, applicationEntryPoint); + } + @Override public boolean equals(Object obj) { if (this == obj) { @@ -134,16 +144,6 @@ public class ClassificationImpl extends ClassificationSummaryImpl implements Cla && Objects.equals(applicationEntryPoint, other.applicationEntryPoint); } - @Override - public int hashCode() { - return Objects.hash( - super.hashCode(), isValidInDomain, created, modified, description, applicationEntryPoint); - } - - protected boolean canEqual(Object other) { - return (other instanceof ClassificationImpl); - } - @Override public String toString() { return "ClassificationImpl [id=" 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 14677de81..ed5db2c4e 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 @@ -47,8 +47,10 @@ import pro.taskana.sampledata.SampleDataGenerator; public class ClassificationServiceImplIntExplicitTest { private static final String ID_PREFIX_CLASSIFICATION = "CLI"; + @SuppressWarnings("checkstyle:DeclarationOrder") static int counter = 0; + private DataSource dataSource; private ClassificationService classificationService; private TaskanaEngineConfiguration taskanaEngineConfiguration; diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java index fd21a2a79..198a52c8d 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java @@ -46,8 +46,10 @@ import pro.taskana.security.WithAccessId; class WorkbasketServiceImplIntExplicitTest { private static final int SLEEP_TIME = 100; + @SuppressWarnings("checkstyle:DeclarationOrder") static int counter = 0; + private DataSource dataSource; private TaskanaEngineConfiguration taskanaEngineConfiguration; private TaskanaEngine taskanaEngine; diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java index 2ab91a445..e5e28a5e8 100644 --- a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java +++ b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java @@ -42,8 +42,10 @@ import pro.taskana.rest.resource.TaskResourceAssembler; class AsyncUpdateJobIntTest { private static final String CLASSIFICATION_ID = "CLI:100000000000000000000000000000000003"; + @SuppressWarnings("checkstyle:DeclarationOrder") static RestTemplate template; + @Autowired ClassificationResourceAssembler classificationResourceAssembler; @Autowired TaskResourceAssembler taskResourceAssembler; @Autowired JobScheduler jobScheduler;