From 86cfcdf220c25781acacf14974fcd2480849dd5d Mon Sep 17 00:00:00 2001
From: Henry Borasch <Henry.Borasch@sinc.de>
Date: Fri, 24 Feb 2023 15:49:20 +0100
Subject: [PATCH] merged changes from master
---
.../fitconnect/core/validation/DefaultValidationService.java | 1 -
.../fitconnect/core/events/SecurityEventTokenServiceTest.java | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java b/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java
index d07b03f14..96cb250e0 100644
--- a/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java
@@ -34,7 +34,6 @@ import org.xml.sax.XMLReader;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.net.InetSocketAddress;
diff --git a/core/src/test/java/dev/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java b/core/src/test/java/dev/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java
index bf3ee88ef..15f7f8e50 100644
--- a/core/src/test/java/dev/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java
@@ -60,7 +60,9 @@ class SecurityEventTokenServiceTest {
final List<String> setSchemas = SchemaConfig.getSetSchemaFilePaths("/set-schema");
final List<String> metadataSchemas = SchemaConfig.getMetadataSchemaFileNames("/metadata-schema");
- final SchemaProvider schemaProvider = new SchemaResourceProvider(setSchemas, metadataSchemas);
+ final List<String> destinationSchemas = SchemaConfig.getDestinationSchemaPaths("/destination-schema");
+ final SchemaResources schemaResources = new SchemaResources(setSchemas, metadataSchemas, destinationSchemas);
+ final SchemaProvider schemaProvider = new SchemaResourceProvider(schemaResources);
this.validationService = new DefaultValidationService(config, new HashService(), schemaProvider, "trusted-test-root-certificates");
this.underTest = new SecurityEventTokenService(config, this.validationService, this.signingKey);
}
--
GitLab