Skip to content

Commit 5986d12

Browse files
committed
Quality fixes
1 parent ce0ca7e commit 5986d12

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/FileManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import eu.europa.ec.itb.validation.commons.config.DomainConfig;
2222
import org.apache.commons.io.FileUtils;
2323
import org.apache.tika.Tika;
24+
import org.apache.tika.metadata.HttpHeaders;
2425
import org.apache.tika.metadata.Metadata;
2526
import org.springframework.stereotype.Component;
2627

@@ -57,7 +58,7 @@ public String getFileExtension(String contentType) {
5758
public boolean checkFileType(InputStream stream) throws IOException {
5859
Tika tika = new Tika();
5960
var metadata = new Metadata();
60-
metadata.set(Metadata.CONTENT_TYPE, "application/json");
61+
metadata.set(HttpHeaders.CONTENT_TYPE, "application/json");
6162
String type = tika.detect(stream, metadata);
6263
return config.getAcceptedMimeTypes().contains(type);
6364
}

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/JSONValidator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,9 @@ private JsonNodeReader getJsonReader() {
355355

356356
private Function<ValidationMessage, String> getLocationMapper() {
357357
if (specs.isLocationAsPointer()) {
358-
return (msg) -> msg.getInstanceLocation().toString();
358+
return msg -> msg.getInstanceLocation().toString();
359359
} else {
360-
return (msg) -> {
360+
return msg -> {
361361
var nodeLocation = JsonNodes.tokenLocationOf(msg.getInstanceNode());
362362
int lineNumber = 0;
363363
if (nodeLocation != null && nodeLocation.getLineNr() > 0) {
@@ -377,7 +377,7 @@ private Function<ValidationMessage, String> getLocationMapper() {
377377
private List<Message> validateAgainstSchema(File schemaFile) {
378378
var schemaInfo = readSchema(schemaFile.toPath());
379379
var locationMapper = getLocationMapper();
380-
return schemaInfo.getLeft().validate(getContentNode(schemaInfo.getRight())).stream().map((message) -> new Message(StringUtils.removeStart(message.getMessage(), "[] "), locationMapper.apply(message))).collect(Collectors.toList());
380+
return schemaInfo.getLeft().validate(getContentNode(schemaInfo.getRight())).stream().map(message -> new Message(StringUtils.removeStart(message.getMessage(), "[] "), locationMapper.apply(message))).toList();
381381
}
382382

383383
/**

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/ValidationSpecs.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
*/
4343
public class ValidationSpecs {
4444

45-
private final static ObjectReader YAML_READER;
46-
private final static ObjectWriter YAML_WRITER;
47-
private final static ObjectReader JSON_READER;
48-
private final static ObjectWriter JSON_WRITER;
45+
private static final ObjectReader YAML_READER;
46+
private static final ObjectWriter YAML_WRITER;
47+
private static final ObjectReader JSON_READER;
48+
private static final ObjectWriter JSON_WRITER;
4949

5050
private File input;
5151
private File inputToUse;

jsonvalidator-jar/src/main/java/eu/europa/ec/itb/json/standalone/ValidationRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ private void printUsage(boolean requireType) {
246246
parametersMessage
247247
.append("\n").append(PAD).append(PAD).append("- SCHEMA_FILE_OR_URI_X is the full file path or URI to a schema for the validation.")
248248
.append("\n").append(PAD).append(PAD).append("- SCHEMA_COMBINATION defines how the provided schemas will be combined, one of [")
249-
.append(String.join("|", new String[] {ValidationArtifactCombinationApproach.ALL.getName(), ValidationArtifactCombinationApproach.ANY.getName(), ValidationArtifactCombinationApproach.ONE_OF.getName()}))
249+
.append(String.join("|", ValidationArtifactCombinationApproach.ALL.getName(), ValidationArtifactCombinationApproach.ANY.getName(), ValidationArtifactCombinationApproach.ONE_OF.getName()))
250250
.append("] (default is ").append(DEFAULT_COMBINATION_APPROACH.getName()).append(").");
251251
}
252252
usageMessage.append("\n").append(PAD).append("Where:");

0 commit comments

Comments
 (0)