diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationImpl.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationImpl.java index 69a159831..99476159e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationImpl.java @@ -38,85 +38,6 @@ public class ClassificationImpl extends ClassificationSummaryImpl implements Cla this.applicationEntryPoint = applicationEntryPoint; } - @Override - protected boolean canEqual(Object other) { - return (other instanceof ClassificationImpl); - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode(), isValidInDomain, created, modified, description); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof ClassificationImpl)) { - return false; - } - if (!super.equals(obj)) { - return false; - } - ClassificationImpl other = (ClassificationImpl) obj; - return Objects.equals(isValidInDomain, other.isValidInDomain) - && Objects.equals(created, other.created) - && Objects.equals(modified, other.modified) - && Objects.equals(description, other.description); - } - - @Override - public String toString() { - return "ClassificationImpl [id=" - + id - + ", key=" - + key - + ", parentId=" - + parentId - + ", parentKey=" - + parentKey - + ", category=" - + category - + ", type=" - + type - + ", domain=" - + domain - + ", isValidInDomain=" - + isValidInDomain - + ", created=" - + created - + ", modified=" - + modified - + ", name=" - + name - + ", description=" - + description - + ", priority=" - + priority - + ", serviceLevel=" - + serviceLevel - + ", applicationEntryPoint=" - + applicationEntryPoint - + ", custom1=" - + custom1 - + ", custom2=" - + custom2 - + ", custom3=" - + custom3 - + ", custom4=" - + custom4 - + ", custom5=" - + custom5 - + ", custom6=" - + custom6 - + ", custom7=" - + custom7 - + ", custom8=" - + custom8 - + "]"; - } - @Override public ClassificationImpl copy(String key) { return new ClassificationImpl(this, key); @@ -222,4 +143,83 @@ public class ClassificationImpl extends ClassificationSummaryImpl implements Cla summary.setCustom8(custom8); return summary; } + + @Override + protected boolean canEqual(Object other) { + return (other instanceof ClassificationImpl); + } + + @Override + public int hashCode() { + return Objects.hash(super.hashCode(), isValidInDomain, created, modified, description); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof ClassificationImpl)) { + return false; + } + if (!super.equals(obj)) { + return false; + } + ClassificationImpl other = (ClassificationImpl) obj; + return Objects.equals(isValidInDomain, other.isValidInDomain) + && Objects.equals(created, other.created) + && Objects.equals(modified, other.modified) + && Objects.equals(description, other.description); + } + + @Override + public String toString() { + return "ClassificationImpl [id=" + + id + + ", key=" + + key + + ", parentId=" + + parentId + + ", parentKey=" + + parentKey + + ", category=" + + category + + ", type=" + + type + + ", domain=" + + domain + + ", isValidInDomain=" + + isValidInDomain + + ", created=" + + created + + ", modified=" + + modified + + ", name=" + + name + + ", description=" + + description + + ", priority=" + + priority + + ", serviceLevel=" + + serviceLevel + + ", applicationEntryPoint=" + + applicationEntryPoint + + ", custom1=" + + custom1 + + ", custom2=" + + custom2 + + ", custom3=" + + custom3 + + ", custom4=" + + custom4 + + ", custom5=" + + custom5 + + ", custom6=" + + custom6 + + ", custom7=" + + custom7 + + ", custom8=" + + custom8 + + "]"; + } } diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/TimeIntervalReportBuilder.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/TimeIntervalReportBuilder.java index e1374b609..39f94bb2c 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/TimeIntervalReportBuilder.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/TimeIntervalReportBuilder.java @@ -99,12 +99,12 @@ public interface TimeIntervalReportBuilder< * Adds the values of a certain {@linkplain TaskCustomField} for exact matching to the builder. * *

The created report contains only tasks with a {@linkplain - * Task#getCustomField(TaskCustomField) custom attribute} value exactly matching one of the - * items in the list. + * Task#getCustomField(TaskCustomField) custom attribute} value exactly matching one of the items + * in the list. * * @param customField the specified {@linkplain TaskCustomField} - * @param strings the values the specified {@linkplain Task#getCustomField(TaskCustomField) - * custom attribute} should match + * @param strings the values the specified {@linkplain Task#getCustomField(TaskCustomField) custom + * attribute} should match * @return the modified {@linkplain TimeIntervalReportBuilder} * @throws InvalidArgumentException if filter values are not given */ @@ -115,12 +115,12 @@ public interface TimeIntervalReportBuilder< * Excludes the values of a certain {@linkplain TaskCustomField} to the builder. * *

The created report contains only tasks with a {@linkplain - * Task#getCustomField(TaskCustomField) custom attribute} value not matching one of the items - * in the list. + * Task#getCustomField(TaskCustomField) custom attribute} value not matching one of the items in + * the list. * * @param customField the specified {@linkplain TaskCustomField} - * @param strings the values the specified {@linkplain Task#getCustomField(TaskCustomField) - * custom attribute} should not match + * @param strings the values the specified {@linkplain Task#getCustomField(TaskCustomField) custom + * attribute} should not match * @return the modified {@linkplain TimeIntervalReportBuilder} * @throws InvalidArgumentException if filter values are not given */ @@ -131,14 +131,14 @@ public interface TimeIntervalReportBuilder< * Adds the values of a certain {@linkplain TaskCustomField} for pattern matching to the builder. * *

The created report contains only tasks with a {@linkplain - * Task#getCustomField(TaskCustomField) custom attribute} value pattern-matching one of the - * items in the list. They will be compared in SQL with the LIKE operator. You may use a wildcard - * like % to specify the pattern. If you specify multiple arguments they are combined with the OR + * Task#getCustomField(TaskCustomField) custom attribute} value pattern-matching one of the items + * in the list. They will be compared in SQL with the LIKE operator. You may use a wildcard like % + * to specify the pattern. If you specify multiple arguments they are combined with the OR * keyword. * * @param customField the specified {@linkplain TaskCustomField} - * @param strings the values the specified {@linkplain Task#getCustomField(TaskCustomField) - * custom attribute} should match + * @param strings the values the specified {@linkplain Task#getCustomField(TaskCustomField) custom + * attribute} should match * @return the modified {@linkplain TimeIntervalReportBuilder} * @throws InvalidArgumentException if filter values are not given */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/WorkbasketPriorityReport.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/WorkbasketPriorityReport.java index 297270049..397552c2a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/WorkbasketPriorityReport.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/WorkbasketPriorityReport.java @@ -116,8 +116,8 @@ public class WorkbasketPriorityReport extends ReportThe created report contains only tasks with a {@linkplain - * Task#getCustomField(TaskCustomField) custom attribute} value not matching one of the - * items in the list. + * Task#getCustomField(TaskCustomField) custom attribute} value not matching one of the items in + * the list. * * @param customField the specified {@linkplain TaskCustomField} * @param strings the values the specified {@linkplain Task#getCustomField(TaskCustomField) diff --git a/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java b/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java index 53a39971f..f488e4d53 100644 --- a/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java +++ b/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java @@ -21,8 +21,8 @@ import pro.taskana.workbasket.rest.models.WorkbasketSummaryRepresentationModel; @TaskanaSpringBootTest public class AbstractAccTest { - protected RestHelper restHelper = new RestHelper(8080); protected static final String DEPENDENCY_VERSION = "5.1.1-SNAPSHOT"; + protected RestHelper restHelper = new RestHelper(8080); protected TaskRepresentationModel getTaskResourceSample() { ClassificationSummaryRepresentationModel classificationResource =