From 593aab5be8f26c9017a0c025db248d72049e3ddc Mon Sep 17 00:00:00 2001
From: Klaus Fischer <klaus.fischer@eloware.com>
Date: Thu, 24 Nov 2022 23:23:33 +0100
Subject: [PATCH] Removed unsed imports
---
BasicUnitTest/JsonSchemaValidation.cs | 7 ++++---
BasicUnitTest/SecurityEventTokenTests.cs | 3 ---
DemoRunner/SenderDemo.cs | 1 -
FitConnect/EncryptedSender.cs | 5 -----
FitConnect/Encryption/CertificateHelper.cs | 1 -
FitConnect/Encryption/JsonHelper.cs | 5 +++--
FitConnect/FitConnectClient.cs | 6 +++---
FitConnect/Interfaces/Sender/ISenderWithAttachments.cs | 2 --
FitConnect/Models/Submission.cs | 2 --
FitConnect/Router.cs | 7 +++----
FitConnect/Sender.cs | 6 +++---
.../Services/Interfaces/ISelfServicePortalService.cs | 1 -
FitConnect/Services/SelfServicePortalService.cs | 1 -
FitConnect/Services/SubmissionService.cs | 1 -
FitConnect/Subscriber.cs | 8 --------
IntegrationTests/CertificateValidation.cs | 2 --
IntegrationTests/Sender/SenderTestBase.cs | 1 -
IntegrationTests/Sender/SenderTestUnhappyPath.cs | 1 -
IntegrationTests/Subscriber/SubscriberTestUnHappyPath.cs | 3 ---
19 files changed, 16 insertions(+), 47 deletions(-)
diff --git a/BasicUnitTest/JsonSchemaValidation.cs b/BasicUnitTest/JsonSchemaValidation.cs
index 390a1441..bd9e290f 100644
--- a/BasicUnitTest/JsonSchemaValidation.cs
+++ b/BasicUnitTest/JsonSchemaValidation.cs
@@ -8,6 +8,7 @@ using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Schema;
using NUnit.Framework;
+using JsonSchema = NJsonSchema.JsonSchema;
namespace BasicUnitTest;
@@ -34,7 +35,7 @@ public class JsonSchemaValidation {
[Test]
[Ignore("Package does not support this yet")]
public void NJson_ShouldPass() {
- var schema = NJsonSchema.JsonSchema.FromJsonAsync(_schemaJson).Result;
+ var schema = JsonSchema.FromJsonAsync(_schemaJson).Result;
_jsonData.ForEach(l => schema.Validate(l));
}
@@ -42,7 +43,7 @@ public class JsonSchemaValidation {
public void JsonSchema_ShouldPass() {
_jsonData.ForEach(l => {
var jObject = JObject.Parse(l);
- var schema = Newtonsoft.Json.Schema.JSchema.Parse(_schemaJson);
+ var schema = JSchema.Parse(_schemaJson);
var result = jObject.IsValid(schema);
if (!result) {
Console.WriteLine(jObject.ToString());
@@ -55,7 +56,7 @@ public class JsonSchemaValidation {
[Test]
public void JsonSchema_ShouldFail() {
- var schema = Newtonsoft.Json.Schema.JSchema.Parse(_schemaJson);
+ var schema = JSchema.Parse(_schemaJson);
JObject.Parse(
"{\"sub\":\"submission:22a69c34-4ca4-43f7-a909-dcfe7f972c27\",\"$schema\":\"https://schema.fitko.de/fit-connect/set-payload/1.0.0/set-payload.schema.json\",\"iss\":\"https://submission-api-testing.fit-connect.fitko.dev\",\"txn\":\"case:5ef6d3c7-a9db-4b23-89a6-75f5011bd57a\",\"iat\":1661228799,\"jti\":\"c7ff0d9d-2caa-481d-b9ce-c6d4a1c6ee02\",\"event\":{\"https://schema.fitko.de/fit-connect/events/submit-submission\":{\"authenticationTags\":{\"data\":\"6hvHPpXSgRfeFAUWJRb5eQ\",\"metadata\":\"T_kVHCwoMCpg42c3CjeZAQ\",\"attachments\":{\"33b17890-2a86-47a4-8fb9-92befc782e13\":\"DxndA7vZAq_karEDRL31-Q\"}}}}}")
.IsValid(schema).Should().BeFalse();
diff --git a/BasicUnitTest/SecurityEventTokenTests.cs b/BasicUnitTest/SecurityEventTokenTests.cs
index a7cdb56f..80709258 100644
--- a/BasicUnitTest/SecurityEventTokenTests.cs
+++ b/BasicUnitTest/SecurityEventTokenTests.cs
@@ -1,8 +1,5 @@
using System;
-using System.Collections.Generic;
-using System.IO;
using Autofac;
-using FitConnect;
using FitConnect.Encryption;
using FitConnect.Models;
using FitConnect.Models.v1.Api;
diff --git a/DemoRunner/SenderDemo.cs b/DemoRunner/SenderDemo.cs
index 14f96a03..a3164cfa 100644
--- a/DemoRunner/SenderDemo.cs
+++ b/DemoRunner/SenderDemo.cs
@@ -1,4 +1,3 @@
-using System.Threading.Channels;
using FitConnect;
using FitConnect.Encryption;
using FitConnect.Models;
diff --git a/FitConnect/EncryptedSender.cs b/FitConnect/EncryptedSender.cs
index fdcf7841..e5fc95ee 100644
--- a/FitConnect/EncryptedSender.cs
+++ b/FitConnect/EncryptedSender.cs
@@ -1,8 +1,3 @@
-using FitConnect.Interfaces.Sender;
-using FitConnect.Models;
-using FitConnect.Services.Models.v1.Submission;
-using Microsoft.Extensions.Logging;
-
namespace FitConnect;
public class EncryptedSubmissionBuilder : IEncryptedBuilderWithData,
diff --git a/FitConnect/Encryption/CertificateHelper.cs b/FitConnect/Encryption/CertificateHelper.cs
index e3eea8c6..faa6c12e 100644
--- a/FitConnect/Encryption/CertificateHelper.cs
+++ b/FitConnect/Encryption/CertificateHelper.cs
@@ -5,7 +5,6 @@ using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
-
namespace FitConnect.Encryption;
public class CertificateHelper {
diff --git a/FitConnect/Encryption/JsonHelper.cs b/FitConnect/Encryption/JsonHelper.cs
index 6fc80b2f..8dcaf5e1 100644
--- a/FitConnect/Encryption/JsonHelper.cs
+++ b/FitConnect/Encryption/JsonHelper.cs
@@ -2,12 +2,13 @@ using System.Reflection;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Schema;
+using JsonSchema = NJsonSchema.JsonSchema;
namespace FitConnect.Encryption;
public static class JsonHelper {
public static bool ValidateJsonSchema(string schema, string json, ILogger? logger = null) {
- var jSchema = Newtonsoft.Json.Schema.JSchema.Parse(schema);
+ var jSchema = JSchema.Parse(schema);
return JObject.Parse(json).IsValid(jSchema);
}
@@ -19,7 +20,7 @@ public static class JsonHelper {
/// <returns></returns>
public static async Task<bool> VerifyMetadata(string metadataString, ILogger? logger = null) {
var schemaString = LoadContentOfResource("metadata.schema.json");
- var schema = await NJsonSchema.JsonSchema.FromJsonAsync(schemaString);
+ var schema = await JsonSchema.FromJsonAsync(schemaString);
var result = schema.Validate(metadataString).ToList();
logger?.LogWarning("Validation failed with {Errors}",
result.Aggregate("", (a, b) => a + "\n\t" + b));
diff --git a/FitConnect/FitConnectClient.cs b/FitConnect/FitConnectClient.cs
index 32e25f98..2ffbf11e 100644
--- a/FitConnect/FitConnectClient.cs
+++ b/FitConnect/FitConnectClient.cs
@@ -7,8 +7,8 @@ using FitConnect.Services.Interfaces;
using FitConnect.Services.Models.v1.Submission;
using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens;
-using Newtonsoft.Json.Schema;
-using ValidationError = NJsonSchema.Validation.ValidationError;
+using NJsonSchema;
+using NJsonSchema.Validation;
namespace FitConnect;
@@ -27,7 +27,7 @@ public abstract class FitConnectClient {
/// </summary>
public static async Task<ICollection<ValidationError>> ValidateSchemaAsync(
string dataString, string schemaString) {
- var schema = await NJsonSchema.JsonSchema.FromJsonAsync(schemaString);
+ var schema = await JsonSchema.FromJsonAsync(schemaString);
return schema.Validate(dataString);
}
diff --git a/FitConnect/Interfaces/Sender/ISenderWithAttachments.cs b/FitConnect/Interfaces/Sender/ISenderWithAttachments.cs
index c9c0d707..8b025aeb 100644
--- a/FitConnect/Interfaces/Sender/ISenderWithAttachments.cs
+++ b/FitConnect/Interfaces/Sender/ISenderWithAttachments.cs
@@ -1,5 +1,3 @@
-using FitConnect.Models;
-
namespace FitConnect.Interfaces.Sender;
public interface ISenderWithAttachments : ISenderReady {
diff --git a/FitConnect/Models/Submission.cs b/FitConnect/Models/Submission.cs
index 25ccc974..3045d568 100644
--- a/FitConnect/Models/Submission.cs
+++ b/FitConnect/Models/Submission.cs
@@ -1,5 +1,3 @@
-using System.Security.Cryptography.X509Certificates;
-using FitConnect.Models.v1.Api;
using FitConnect.Services.Models;
using FitConnect.Services.Models.v1.Submission;
diff --git a/FitConnect/Router.cs b/FitConnect/Router.cs
index cdff2512..df3e599a 100644
--- a/FitConnect/Router.cs
+++ b/FitConnect/Router.cs
@@ -3,13 +3,12 @@ using FitConnect.Encryption;
using FitConnect.Models;
using FitConnect.Services;
using FitConnect.Services.Interfaces;
-using Jose;
+using IdentityModel;
using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.JsonWebTokens;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
-using Base64Url = IdentityModel.Base64Url;
using Route = FitConnect.Services.Models.v1.Routes.Route;
namespace FitConnect;
@@ -142,8 +141,8 @@ internal class Router : IRouter {
}
public class OrderedContractResolver : DefaultContractResolver {
- protected override System.Collections.Generic.IList<JsonProperty> CreateProperties(
- System.Type type, MemberSerialization memberSerialization) {
+ protected override IList<JsonProperty> CreateProperties(
+ Type type, MemberSerialization memberSerialization) {
NamingStrategy = new CamelCaseNamingStrategy();
return base.CreateProperties(type, memberSerialization).OrderBy(p => p.PropertyName)
.ToList();
diff --git a/FitConnect/Sender.cs b/FitConnect/Sender.cs
index 9e68ca97..7ba2c540 100644
--- a/FitConnect/Sender.cs
+++ b/FitConnect/Sender.cs
@@ -8,7 +8,7 @@ using FitConnect.Models.Api.Metadata;
using FitConnect.Services.Models.v1.Submission;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
-using Attachment = FitConnect.Models.Attachment;
+using Attachment = FitConnect.Models.Api.Metadata.Attachment;
using Data = FitConnect.Models.Api.Metadata.Data;
using Metadata = FitConnect.Models.Metadata;
using Route = FitConnect.Services.Models.v1.Routes.Route;
@@ -139,7 +139,7 @@ public class Sender : FitConnectClient, ISender {
var contentStructure = new ContentStructure {
Data = data,
Attachments = submission.Attachments.Select(a =>
- new Models.Api.Metadata.Attachment {
+ new Attachment {
Description = a.Description,
AttachmentId = a.Id,
MimeType = a.MimeType,
@@ -216,7 +216,7 @@ public class Sender : FitConnectClient, ISender {
sendable.AddServiceType(submission.ServiceName!, submission.LeikaKey!);
sendable.AddData(submission.Data!);
- sendable!.Attachments = new List<Attachment>();
+ sendable!.Attachments = new List<Models.Attachment>();
if (submission.Attachments != null)
foreach (var attachment in submission.Attachments)
sendable!.Attachments.Add(attachment);
diff --git a/FitConnect/Services/Interfaces/ISelfServicePortalService.cs b/FitConnect/Services/Interfaces/ISelfServicePortalService.cs
index 7b87c780..dce0390c 100644
--- a/FitConnect/Services/Interfaces/ISelfServicePortalService.cs
+++ b/FitConnect/Services/Interfaces/ISelfServicePortalService.cs
@@ -1,4 +1,3 @@
-using Jose;
using Microsoft.IdentityModel.Tokens;
namespace FitConnect.Services.Interfaces;
diff --git a/FitConnect/Services/SelfServicePortalService.cs b/FitConnect/Services/SelfServicePortalService.cs
index 34d520ec..67269c1b 100644
--- a/FitConnect/Services/SelfServicePortalService.cs
+++ b/FitConnect/Services/SelfServicePortalService.cs
@@ -1,5 +1,4 @@
using FitConnect.Services.Interfaces;
-using Jose;
using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens;
diff --git a/FitConnect/Services/SubmissionService.cs b/FitConnect/Services/SubmissionService.cs
index f45e4987..b31f486e 100644
--- a/FitConnect/Services/SubmissionService.cs
+++ b/FitConnect/Services/SubmissionService.cs
@@ -5,7 +5,6 @@ using FitConnect.Services.Models.v1.Submission;
using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
-using NJsonSchema;
namespace FitConnect.Services;
diff --git a/FitConnect/Subscriber.cs b/FitConnect/Subscriber.cs
index d2c7e42a..ddab63ae 100644
--- a/FitConnect/Subscriber.cs
+++ b/FitConnect/Subscriber.cs
@@ -1,9 +1,4 @@
-using System.Net;
-using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
using Autofac;
-using Autofac.Core.Activators.Reflection;
using FitConnect.Encryption;
using FitConnect.Interfaces.Subscriber;
using FitConnect.Models;
@@ -14,9 +9,6 @@ using IdentityModel;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
-using NJsonSchema;
-using NJsonSchema.Annotations;
-using NJsonSchema.Validation;
using Metadata = FitConnect.Models.Api.Metadata.Metadata;
namespace FitConnect;
diff --git a/IntegrationTests/CertificateValidation.cs b/IntegrationTests/CertificateValidation.cs
index 71041157..7adcd77f 100644
--- a/IntegrationTests/CertificateValidation.cs
+++ b/IntegrationTests/CertificateValidation.cs
@@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using System.Net;
using System.Security;
using System.Security.Cryptography.X509Certificates;
using Autofac;
@@ -13,7 +12,6 @@ using FluentAssertions;
using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens;
using MockContainer;
-using Moq;
using NUnit.Framework;
namespace IntegrationTests;
diff --git a/IntegrationTests/Sender/SenderTestBase.cs b/IntegrationTests/Sender/SenderTestBase.cs
index 49057c2d..7c5a20b9 100644
--- a/IntegrationTests/Sender/SenderTestBase.cs
+++ b/IntegrationTests/Sender/SenderTestBase.cs
@@ -1,6 +1,5 @@
using System;
using System.IO;
-using System.Linq;
using FitConnect.Interfaces.Sender;
using FitConnect.Models;
using Microsoft.Extensions.Logging;
diff --git a/IntegrationTests/Sender/SenderTestUnhappyPath.cs b/IntegrationTests/Sender/SenderTestUnhappyPath.cs
index b327736e..744bf75e 100644
--- a/IntegrationTests/Sender/SenderTestUnhappyPath.cs
+++ b/IntegrationTests/Sender/SenderTestUnhappyPath.cs
@@ -1,5 +1,4 @@
using System;
-using System.Net.Http;
using FitConnect;
using FitConnect.Models;
using FluentAssertions;
diff --git a/IntegrationTests/Subscriber/SubscriberTestUnHappyPath.cs b/IntegrationTests/Subscriber/SubscriberTestUnHappyPath.cs
index 31b3e027..d4c74f51 100644
--- a/IntegrationTests/Subscriber/SubscriberTestUnHappyPath.cs
+++ b/IntegrationTests/Subscriber/SubscriberTestUnHappyPath.cs
@@ -1,9 +1,6 @@
using System;
-using System.Linq;
using FitConnect.Encryption;
using FluentAssertions;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
using NUnit.Framework;
namespace IntegrationTests.Subscriber;
--
GitLab