Skip to content

Commit 1e56e17

Browse files
committed
Version upgrade.
1 parent a87b649 commit 1e56e17

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/config/BeanConfiguration.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package eu.europa.ec.itb.json.config;
22

33
import eu.europa.ec.itb.validation.commons.config.DomainPluginConfigProvider;
4+
import org.leadpony.justify.api.JsonValidationService;
45
import org.springframework.context.annotation.Bean;
56
import org.springframework.context.annotation.Configuration;
67

@@ -12,4 +13,9 @@ public DomainPluginConfigProvider pluginConfigProvider() {
1213
return new DomainPluginConfigProvider();
1314
}
1415

16+
@Bean
17+
public JsonValidationService jsonValidationService() {
18+
return JsonValidationService.newInstance();
19+
}
20+
1521
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ public class JSONValidator {
5454
private DomainPluginConfigProvider pluginConfigProvider = null;
5555
@Autowired
5656
private ApplicationConfig appConfig = null;
57+
@Autowired
58+
private JsonValidationService jsonValidationService = null;
5759

5860
private ObjectFactory objectFactory = new ObjectFactory();
5961
private File inputFileToValidate;
@@ -206,16 +208,15 @@ private void addBranchErrors(List<String> aggregatedErrorMessages, List<String>
206208
}
207209

208210
private List<String> validateAgainstSchema(File schemaFile) {
209-
JsonValidationService service = JsonValidationService.newInstance();
210211
JsonSchema schema;
211212
try {
212-
schema = service.readSchema(schemaFile.toPath());
213+
schema = jsonValidationService.readSchema(schemaFile.toPath());
213214
} catch (JsonParsingException e) {
214215
throw new ValidatorException("Error while parsing JSON schema: "+e.getMessage(), e);
215216
}
216217
List<String> errorMessages = new ArrayList<>();
217-
ProblemHandler handler = service.createProblemPrinterBuilder(errorMessages::add).withLocation(true).build();
218-
try (JsonParser parser = service.createParser(inputFileToValidate.toPath(), schema, handler)) {
218+
ProblemHandler handler = jsonValidationService.createProblemPrinterBuilder(errorMessages::add).withLocation(true).build();
219+
try (JsonParser parser = jsonValidationService.createParser(inputFileToValidate.toPath(), schema, handler)) {
219220
while (parser.hasNext()) {
220221
parser.next();
221222
}

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<validatorTimestamp>${maven.build.timestamp}</validatorTimestamp>
2626
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss (XXX)</maven.build.timestamp.format>
2727
<version.springBoot>2.3.3.RELEASE</version.springBoot>
28-
<version.gitbTypes>1.10.0</version.gitbTypes>
28+
<version.gitbTypes>1.10.1</version.gitbTypes>
2929
<version.itbCommons>1.0.0-SNAPSHOT</version.itbCommons>
3030
<version.slf4j>1.7.30</version.slf4j>
3131
<version.jaxws>2.3.1</version.jaxws>
@@ -36,8 +36,8 @@
3636
<version.commonsConfiguration>2.7</version.commonsConfiguration>
3737
<version.commonsLang>3.10</version.commonsLang>
3838
<version.commonsIo>2.7</version.commonsIo>
39-
<version.justify>3.0.0-RC1</version.justify>
40-
<version.jakartaJson>2.0.0-RC2</version.jakartaJson>
39+
<version.justify>3.0.0-RC2</version.justify>
40+
<version.jakartaJson>2.0.0-RC3</version.jakartaJson>
4141
<version.gson>2.8.6</version.gson>
4242
<version.tika>1.24.1</version.tika>
4343
<version.hibernateValidator>5.0.2.Final</version.hibernateValidator>

0 commit comments

Comments
 (0)