From e1e63d779380c1577637a98a6d8db4b30db588d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Hiszpa=C5=84ski?= Date: Sat, 2 Dec 2023 10:38:41 +0100 Subject: [PATCH] Upgrade to Java 17 --- pom.xml | 2 +- .../java/com/avispa/ecm/model/EcmEntity.java | 4 +- .../java/com/avispa/ecm/model/EcmObject.java | 4 +- .../model/configuration/context/Context.java | 3 +- .../configuration/context/ContextService.java | 2 +- .../load/ConfigurationReader.java | 2 +- .../load/mapper/ContextMapper.java | 4 +- .../content/mapper/PropertyPageMapper.java | 12 ++-- .../content/mapper/SimpleControlMapper.java | 9 +-- .../content/mapper/TableMapper.java | 5 +- .../java/com/avispa/ecm/util/Version.java | 13 +---- .../ecm/util/condition/ConditionParser.java | 38 ++++++------- .../ecm/util/condition/ConditionResolver.java | 57 ++++++------------- .../condition/intermediate/Condition.java | 8 +-- .../ecm/util/expression/FunctionFactory.java | 21 +++---- .../expression/function/impl/DateValue.java | 8 +-- .../avispa/ecm/util/parser/ParserFactory.java | 13 ++--- .../dictionary/DictionaryValueSerDesTest.java | 1 - .../load/ConfigurationLoadServiceTest.java | 2 - .../ecm/model/folder/FolderServiceTest.java | 4 +- .../expression/ExpressionResolverTest.java | 3 +- .../ecm/util/json/JsonValidatorTest.java | 2 +- .../com/avispa/ecm/util/json/VersionTest.java | 6 +- 23 files changed, 78 insertions(+), 145 deletions(-) diff --git a/pom.xml b/pom.xml index 25fa334..7a4dbaa 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ UTF-8 - 11 + 17 4.4.6 1.6.0.Beta1 true diff --git a/src/main/java/com/avispa/ecm/model/EcmEntity.java b/src/main/java/com/avispa/ecm/model/EcmEntity.java index e74b4c8..df40593 100644 --- a/src/main/java/com/avispa/ecm/model/EcmEntity.java +++ b/src/main/java/com/avispa/ecm/model/EcmEntity.java @@ -106,8 +106,8 @@ public Content getPrimaryContent() { @Override public final boolean equals(Object that) { - return this == that || that instanceof EcmEntity - && Objects.equals(id, ((EcmEntity) that).id); + return this == that || that instanceof EcmEntity thatEntity + && Objects.equals(id, thatEntity.id); } @Override diff --git a/src/main/java/com/avispa/ecm/model/EcmObject.java b/src/main/java/com/avispa/ecm/model/EcmObject.java index 316f5c8..d007589 100644 --- a/src/main/java/com/avispa/ecm/model/EcmObject.java +++ b/src/main/java/com/avispa/ecm/model/EcmObject.java @@ -39,17 +39,15 @@ @Entity @Inheritance(strategy = InheritanceType.JOINED) @EntityListeners(AuditingEntityListener.class) +@Getter public abstract class EcmObject extends EcmEntity { - @Getter @CreatedDate private LocalDateTime creationDate; - @Getter @LastModifiedDate private LocalDateTime modificationDate; - @Getter @Setter @OneToOne(fetch = FetchType.LAZY) private Folder folder; diff --git a/src/main/java/com/avispa/ecm/model/configuration/context/Context.java b/src/main/java/com/avispa/ecm/model/configuration/context/Context.java index fd1eb80..0570f37 100644 --- a/src/main/java/com/avispa/ecm/model/configuration/context/Context.java +++ b/src/main/java/com/avispa/ecm/model/configuration/context/Context.java @@ -31,7 +31,6 @@ import javax.persistence.ManyToOne; import javax.validation.constraints.PositiveOrZero; import java.util.List; -import java.util.stream.Collectors; /** * Contexts importance (for the time being) is based on the insertion order. The context algorithm will search for all @@ -59,6 +58,6 @@ public class Context extends EcmConfig { private int importance; // higher = more important public void setEcmConfigs(List ecmConfigs) { - this.ecmConfigs = ecmConfigs.stream().filter(config -> !(config instanceof Context)).collect(Collectors.toList()); + this.ecmConfigs = ecmConfigs.stream().filter(config -> !(config instanceof Context)).toList(); } } diff --git a/src/main/java/com/avispa/ecm/model/configuration/context/ContextService.java b/src/main/java/com/avispa/ecm/model/configuration/context/ContextService.java index 06e3181..810bde3 100644 --- a/src/main/java/com/avispa/ecm/model/configuration/context/ContextService.java +++ b/src/main/java/com/avispa/ecm/model/configuration/context/ContextService.java @@ -143,7 +143,7 @@ public List getConfigurations(T object) { .collect(Collectors.groupingBy(EcmConfig::getClass)) // group by class name .values().stream() .map(list -> list.get(0))// for each list get only first element - .collect(Collectors.toList()); + .toList(); } /** diff --git a/src/main/java/com/avispa/ecm/model/configuration/load/ConfigurationReader.java b/src/main/java/com/avispa/ecm/model/configuration/load/ConfigurationReader.java index b2e9e75..492cdca 100644 --- a/src/main/java/com/avispa/ecm/model/configuration/load/ConfigurationReader.java +++ b/src/main/java/com/avispa/ecm/model/configuration/load/ConfigurationReader.java @@ -87,7 +87,7 @@ public Configuration read(Path zipConfigPath) { } Configuration config = new Configuration(); - try(FileSystem fileSystem = FileSystems.newFileSystem(zipConfigPath, null)) { + try (FileSystem fileSystem = FileSystems.newFileSystem(zipConfigPath, (ClassLoader) null)) { for(var configType : configurationRegistry) { Path configPath = fileSystem.getPath(configType.getName()); processDirectory(configType, config, configPath); diff --git a/src/main/java/com/avispa/ecm/model/configuration/load/mapper/ContextMapper.java b/src/main/java/com/avispa/ecm/model/configuration/load/mapper/ContextMapper.java index 6d3a36d..b9cd5ce 100644 --- a/src/main/java/com/avispa/ecm/model/configuration/load/mapper/ContextMapper.java +++ b/src/main/java/com/avispa/ecm/model/configuration/load/mapper/ContextMapper.java @@ -25,6 +25,7 @@ import com.avispa.ecm.model.type.Type; import com.avispa.ecm.model.type.TypeService; import com.avispa.ecm.util.exception.RepositoryCorruptionError; +import org.mapstruct.CollectionMappingStrategy; import org.mapstruct.IterableMapping; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -39,7 +40,8 @@ /** * @author Rafał Hiszpański */ -@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE) +@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, + collectionMappingStrategy = CollectionMappingStrategy.TARGET_IMMUTABLE) public abstract class ContextMapper implements EcmConfigMapper { @Autowired private EcmConfigRepository ecmConfigRepository; diff --git a/src/main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/PropertyPageMapper.java b/src/main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/PropertyPageMapper.java index 9e2e721..2144465 100644 --- a/src/main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/PropertyPageMapper.java +++ b/src/main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/PropertyPageMapper.java @@ -83,19 +83,15 @@ private Optional getPropertyPageContent(Content content) { private void processControls(List controls, Object context) { for(Control control : controls) { - if(control instanceof Columns) { - Columns columns = (Columns) control; + if (control instanceof Columns columns) { processControls(columns.getControls(), context); - } else if(control instanceof Group) { - Group group = (Group) control; + } else if (control instanceof Group group) { processControls(group.getControls(), context); - } else if(control instanceof Tabs) { - Tabs tabs = (Tabs)control; + } else if (control instanceof Tabs tabs) { for(Tab tab : tabs.getTabs()) { processControls(tab.getControls(), context); } - } else if(control instanceof Table) { - Table table = (Table)control; + } else if (control instanceof Table table) { tableMapper.processControl(table, context); } else { simpleControlMapper.processControl(control, context); diff --git a/src/main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/SimpleControlMapper.java b/src/main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/SimpleControlMapper.java index 0296d75..7b82721 100644 --- a/src/main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/SimpleControlMapper.java +++ b/src/main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/SimpleControlMapper.java @@ -52,22 +52,19 @@ class SimpleControlMapper extends BaseControlsMapper { } public void processControl(Control control, Object context) { - if(control instanceof Label) { - Label label = (Label)control; + if (control instanceof Label label) { try { label.setExpression(expressionResolver.resolve(context, label.getExpression())); } catch (ExpressionResolverException e) { log.error("Label expression couldn't be resolved", e); } - } else if(control instanceof PropertyControl) { + } else if (control instanceof PropertyControl propertyControl) { // TODO: validate if property is accessible? - PropertyControl propertyControl = (PropertyControl) control; if(Strings.isEmpty(propertyControl.getLabel())) { propertyControl.setLabel(displayService.getDisplayValueFromAnnotation(context.getClass(), propertyControl.getProperty())); } - if(control instanceof ComboRadio) { - ComboRadio comboRadio = (ComboRadio) control; + if (control instanceof ComboRadio comboRadio) { try { if (StringUtils.isEmpty(comboRadio.getTypeName()) && StringUtils.isNotEmpty(comboRadio.getTypeNameExpression())) { comboRadio.setTypeName(expressionResolver.resolve(context, comboRadio.getTypeNameExpression())); diff --git a/src/main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/TableMapper.java b/src/main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/TableMapper.java index adfd20c..36f5c57 100644 --- a/src/main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/TableMapper.java +++ b/src/main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/TableMapper.java @@ -89,9 +89,8 @@ private Class getTableRowClass(Table table, Class contextClass) { if(field != null && field.getType().isAssignableFrom(List.class)) { java.lang.reflect.Type genericFieldType = field.getGenericType(); - if (genericFieldType instanceof ParameterizedType) { - ParameterizedType aType = (ParameterizedType) genericFieldType; - java.lang.reflect.Type[] fieldArgTypes = aType.getActualTypeArguments(); + if (genericFieldType instanceof ParameterizedType parameterizedType) { + java.lang.reflect.Type[] fieldArgTypes = parameterizedType.getActualTypeArguments(); if(fieldArgTypes.length > 0) { Class rowClass = (Class) fieldArgTypes[0]; log.debug("Found table type class: '{}'", rowClass); diff --git a/src/main/java/com/avispa/ecm/util/Version.java b/src/main/java/com/avispa/ecm/util/Version.java index a446903..2ea9af5 100644 --- a/src/main/java/com/avispa/ecm/util/Version.java +++ b/src/main/java/com/avispa/ecm/util/Version.java @@ -19,25 +19,16 @@ package com.avispa.ecm.util; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Getter; /** * @author Rafał Hiszpański */ -@Getter -public class Version { - private final String componentName; - private final String number; - - public Version(String componentName, String number) { - this.componentName = componentName; - this.number = number; - } +public record Version(String componentName, String number) { @JsonIgnore public String getReleaseNumber() { int index = this.number.indexOf('-'); - if(index != -1) { + if (index != -1) { return this.number.substring(0, index); } return this.number; diff --git a/src/main/java/com/avispa/ecm/util/condition/ConditionParser.java b/src/main/java/com/avispa/ecm/util/condition/ConditionParser.java index 64a9db2..60b9afe 100644 --- a/src/main/java/com/avispa/ecm/util/condition/ConditionParser.java +++ b/src/main/java/com/avispa/ecm/util/condition/ConditionParser.java @@ -179,36 +179,30 @@ private Condition parseConditions(String key, JsonNode value) { private Condition processValue(String key, Operator operator, JsonNode value) { ConditionValue conditionValue = getConditionValue(value); - switch(operator) { - case EQ: - return Condition.equal(key, conditionValue); - case NE: - return Condition.notEqual(key, conditionValue); - case GT: - return Condition.greaterThan(key, conditionValue); - case GTE: - return Condition.greaterThanOrEqual(key, conditionValue); - case LT: - return Condition.lessThan(key, conditionValue); - case LTE: - return Condition.lessThanOrEqual(key, conditionValue); - } + return switch (operator) { + case EQ -> Condition.equal(key, conditionValue); + case NE -> Condition.notEqual(key, conditionValue); + case GT -> Condition.greaterThan(key, conditionValue); + case GTE -> Condition.greaterThanOrEqual(key, conditionValue); + case LT -> Condition.lessThan(key, conditionValue); + case LTE -> Condition.lessThanOrEqual(key, conditionValue); + }; - return null; } private ConditionValue getConditionValue(JsonNode value) { JsonNodeType nodeType = value.getNodeType(); - switch(nodeType) { - case STRING: + switch (nodeType) { + case STRING -> { return ConditionValue.text(value.textValue()); - case BOOLEAN: + } + case BOOLEAN -> { return ConditionValue.bool(value.booleanValue()); - case NUMBER: + } + case NUMBER -> { return ConditionValue.number(value.numberValue()); - default: - log.debug("Unsupported node type: {}", nodeType); - break; + } + default -> log.debug("Unsupported node type: {}", nodeType); } return null; } diff --git a/src/main/java/com/avispa/ecm/util/condition/ConditionResolver.java b/src/main/java/com/avispa/ecm/util/condition/ConditionResolver.java index 150208e..b7e47ce 100644 --- a/src/main/java/com/avispa/ecm/util/condition/ConditionResolver.java +++ b/src/main/java/com/avispa/ecm/util/condition/ConditionResolver.java @@ -113,16 +113,13 @@ private List getPredicates(Conditions conditions, CriteriaBuilder cri private List resolveGroup(CriteriaBuilder criteriaBuilder, Root queryRoot, ConditionGroup group) { List predicates = new ArrayList<>(group.getConditions().size()); for (IConditionElement element : group.getConditions()) { - if(element instanceof ConditionGroup) { - ConditionGroup nestedGroup = (ConditionGroup) element; + if (element instanceof ConditionGroup nestedGroup) { List groupPredicates = resolveGroup(criteriaBuilder, queryRoot, nestedGroup); Predicate predicate = getPredicate(nestedGroup.getGroupType(), criteriaBuilder, groupPredicates); predicates.add(predicate); - } else if(element instanceof Condition) { - Condition condition = (Condition) element; - + } else if (element instanceof Condition condition) { predicates.add(getPredicate(condition, criteriaBuilder, queryRoot)); } } @@ -130,43 +127,25 @@ private List resolveGroup(CriteriaBuilder criteriaBuilder, Root groupPredicates) { - switch(groupType) { - case AND: - return criteriaBuilder.and(groupPredicates.toArray(new Predicate[0])); - case OR: - return criteriaBuilder.or(groupPredicates.toArray(new Predicate[0])); - default: - if(log.isWarnEnabled()) { - log.warn("Unknown group type: {}", groupType); - } - return null; - } + return switch (groupType) { + case AND -> criteriaBuilder.and(groupPredicates.toArray(new Predicate[0])); + case OR -> criteriaBuilder.or(groupPredicates.toArray(new Predicate[0])); + }; } private Predicate getPredicate(Condition condition, CriteriaBuilder criteriaBuilder, Root queryRoot) { - String key = condition.getKey(); - Operator operator = condition.getOperator(); - ConditionValue value = condition.getValue(); - - switch(operator) { - case EQ: - return criteriaBuilder.equal(getPath(key, queryRoot), value.getValue()); - case NE: - return criteriaBuilder.notEqual(getPath(key, queryRoot), value.getValue()); - case GT: - return criteriaBuilder.gt(getPath(key, queryRoot), (Number) value.getValue()); - case GTE: - return criteriaBuilder.ge(getPath(key, queryRoot), (Number) value.getValue()); - case LT: - return criteriaBuilder.lt(getPath(key, queryRoot), (Number) value.getValue()); - case LTE: - return criteriaBuilder.le(getPath(key, queryRoot), (Number) value.getValue()); - default: - if(log.isWarnEnabled()) { - log.warn("Unknown operator: {}", operator); - } - return null; - } + String key = condition.key(); + Operator operator = condition.operator(); + ConditionValue value = condition.value(); + + return switch (operator) { + case EQ -> criteriaBuilder.equal(getPath(key, queryRoot), value.getValue()); + case NE -> criteriaBuilder.notEqual(getPath(key, queryRoot), value.getValue()); + case GT -> criteriaBuilder.gt(getPath(key, queryRoot), (Number) value.getValue()); + case GTE -> criteriaBuilder.ge(getPath(key, queryRoot), (Number) value.getValue()); + case LT -> criteriaBuilder.lt(getPath(key, queryRoot), (Number) value.getValue()); + case LTE -> criteriaBuilder.le(getPath(key, queryRoot), (Number) value.getValue()); + }; } private Path getPath(String key, Root queryRoot) { diff --git a/src/main/java/com/avispa/ecm/util/condition/intermediate/Condition.java b/src/main/java/com/avispa/ecm/util/condition/intermediate/Condition.java index 4ae9454..21ab635 100644 --- a/src/main/java/com/avispa/ecm/util/condition/intermediate/Condition.java +++ b/src/main/java/com/avispa/ecm/util/condition/intermediate/Condition.java @@ -20,17 +20,11 @@ import com.avispa.ecm.util.condition.Operator; import com.avispa.ecm.util.condition.intermediate.value.ConditionValue; -import lombok.Value; /** * @author Rafał Hiszpański */ -@Value -public class Condition implements IConditionElement { - String key; - Operator operator; - ConditionValue value; - +public record Condition(String key, Operator operator, ConditionValue value) implements IConditionElement { public static Condition equal(String key, ConditionValue value) { return new Condition(key, Operator.EQ, value); } diff --git a/src/main/java/com/avispa/ecm/util/expression/FunctionFactory.java b/src/main/java/com/avispa/ecm/util/expression/FunctionFactory.java index 26ec065..4ba9aaa 100644 --- a/src/main/java/com/avispa/ecm/util/expression/FunctionFactory.java +++ b/src/main/java/com/avispa/ecm/util/expression/FunctionFactory.java @@ -44,22 +44,15 @@ private FunctionFactory() { public static String resolve(String functionName, String[] functionParams, Object object) { Function function; - switch(functionName) { - case VALUE_FUNCTION: - function = new Value(); - break; - case DATEVALUE_FUNCTION: - function = new DateValue(); - break; - case DEFAULT_FUNCTION: - function = new Default(); - break; - case PAD_FUNCTION: - function = new Pad(); - break; - default: + switch (functionName) { + case VALUE_FUNCTION -> function = new Value(); + case DATEVALUE_FUNCTION -> function = new DateValue(); + case DEFAULT_FUNCTION -> function = new Default(); + case PAD_FUNCTION -> function = new Pad(); + default -> { log.error("Unknown function '{}'", functionName); return null; + } } return resolveFunction(object, functionParams, function); diff --git a/src/main/java/com/avispa/ecm/util/expression/function/impl/DateValue.java b/src/main/java/com/avispa/ecm/util/expression/function/impl/DateValue.java index 60d07f8..13e6792 100644 --- a/src/main/java/com/avispa/ecm/util/expression/function/impl/DateValue.java +++ b/src/main/java/com/avispa/ecm/util/expression/function/impl/DateValue.java @@ -46,14 +46,12 @@ public String resolve(Object object, String[] params) { private String getValue(Object object, String propertyName, String format) { Object value = PropertyUtils.getPropertyValue(object, propertyName); - if(value instanceof LocalDateTime) { - LocalDateTime localDateTime = (LocalDateTime) value; + if (value instanceof LocalDateTime localDateTime) { return localDateTime.format(DateTimeFormatter.ofPattern(format)); - } else if(value instanceof LocalDate) { - LocalDate localDate = (LocalDate) value; + } else if (value instanceof LocalDate localDate) { return localDate.format(DateTimeFormatter.ofPattern(format)); } else { - log.warn("Value '{}' is not a date", value.toString()); + log.warn("Value '{}' is not a date", value != null ? value.toString() : null); } return returnValue(propertyName, value); diff --git a/src/main/java/com/avispa/ecm/util/parser/ParserFactory.java b/src/main/java/com/avispa/ecm/util/parser/ParserFactory.java index 7989d7a..de4bc85 100644 --- a/src/main/java/com/avispa/ecm/util/parser/ParserFactory.java +++ b/src/main/java/com/avispa/ecm/util/parser/ParserFactory.java @@ -35,13 +35,10 @@ public final class ParserFactory { * @return */ public IFileParser get(String extension) { - switch (extension) { - case "txt": - return new TxtParser(); - case "csv": - return new CsvParser(attributeSeparator); - default: - throw new IllegalArgumentException(String.format("Unsupported format: %s", extension)); - } + return switch (extension) { + case "txt" -> new TxtParser(); + case "csv" -> new CsvParser(attributeSeparator); + default -> throw new IllegalArgumentException(String.format("Unsupported format: %s", extension)); + }; } } diff --git a/src/test/java/com/avispa/ecm/model/configuration/dictionary/DictionaryValueSerDesTest.java b/src/test/java/com/avispa/ecm/model/configuration/dictionary/DictionaryValueSerDesTest.java index 867b631..ced7260 100644 --- a/src/test/java/com/avispa/ecm/model/configuration/dictionary/DictionaryValueSerDesTest.java +++ b/src/test/java/com/avispa/ecm/model/configuration/dictionary/DictionaryValueSerDesTest.java @@ -29,7 +29,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.json.JsonTest; -import org.springframework.context.annotation.Import; import org.springframework.test.context.ContextConfiguration; import java.util.Map; diff --git a/src/test/java/com/avispa/ecm/model/configuration/load/ConfigurationLoadServiceTest.java b/src/test/java/com/avispa/ecm/model/configuration/load/ConfigurationLoadServiceTest.java index b75a718..103de4b 100644 --- a/src/test/java/com/avispa/ecm/model/configuration/load/ConfigurationLoadServiceTest.java +++ b/src/test/java/com/avispa/ecm/model/configuration/load/ConfigurationLoadServiceTest.java @@ -25,14 +25,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; import java.nio.file.Path; import java.util.Map; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; diff --git a/src/test/java/com/avispa/ecm/model/folder/FolderServiceTest.java b/src/test/java/com/avispa/ecm/model/folder/FolderServiceTest.java index a2ed0c2..0e39974 100644 --- a/src/test/java/com/avispa/ecm/model/folder/FolderServiceTest.java +++ b/src/test/java/com/avispa/ecm/model/folder/FolderServiceTest.java @@ -40,8 +40,8 @@ @SpringBootTest @Slf4j class FolderServiceTest { - private FolderService folderService; - private DocumentRepository documentRepository; + private final FolderService folderService; + private final DocumentRepository documentRepository; @Autowired public FolderServiceTest(FolderService folderService, DocumentRepository documentRepository) { diff --git a/src/test/java/com/avispa/ecm/util/expression/ExpressionResolverTest.java b/src/test/java/com/avispa/ecm/util/expression/ExpressionResolverTest.java index e708c2d..0073df4 100644 --- a/src/test/java/com/avispa/ecm/util/expression/ExpressionResolverTest.java +++ b/src/test/java/com/avispa/ecm/util/expression/ExpressionResolverTest.java @@ -151,8 +151,7 @@ private static void recursive(ParseTree aRoot, StringBuilder buf, int offset, Li buf.append(" ".repeat(Math.max(0, offset))); buf.append(Trees.getNodeText(aRoot, ruleNames)).append("\n"); - if (aRoot instanceof ParserRuleContext) { - ParserRuleContext prc = (ParserRuleContext) aRoot; + if (aRoot instanceof ParserRuleContext prc) { if (prc.children != null) { for (ParseTree child : prc.children) { recursive(child, buf, offset + 1, ruleNames); diff --git a/src/test/java/com/avispa/ecm/util/json/JsonValidatorTest.java b/src/test/java/com/avispa/ecm/util/json/JsonValidatorTest.java index a81c764..7333934 100644 --- a/src/test/java/com/avispa/ecm/util/json/JsonValidatorTest.java +++ b/src/test/java/com/avispa/ecm/util/json/JsonValidatorTest.java @@ -46,7 +46,7 @@ */ class JsonValidatorTest { - private JsonValidator jsonValidator = new JsonValidator(new ObjectMapper()); + private final JsonValidator jsonValidator = new JsonValidator(new ObjectMapper()); @ParameterizedTest @ValueSource(strings = { diff --git a/src/test/java/com/avispa/ecm/util/json/VersionTest.java b/src/test/java/com/avispa/ecm/util/json/VersionTest.java index 8358501..d40e5b6 100644 --- a/src/test/java/com/avispa/ecm/util/json/VersionTest.java +++ b/src/test/java/com/avispa/ecm/util/json/VersionTest.java @@ -32,14 +32,14 @@ class VersionTest { @Test void snapshotVersion() { - assertEquals("AVISPA ECM", snapshotVersion.getComponentName()); - assertEquals("1.0.3-SNAPSHOT", snapshotVersion.getNumber()); + assertEquals("AVISPA ECM", snapshotVersion.componentName()); + assertEquals("1.0.3-SNAPSHOT", snapshotVersion.number()); assertEquals("1.0.3", snapshotVersion.getReleaseNumber()); } @Test void releaseVersion() { - assertEquals("1.0.3", releaseVersion.getNumber()); + assertEquals("1.0.3", releaseVersion.number()); assertEquals("1.0.3", releaseVersion.getReleaseNumber()); } } \ No newline at end of file