From 49b5ef20cde9c777f78f1371560f1241f892b08f Mon Sep 17 00:00:00 2001
From: Pawel GUTOWSKI <Pawel.GUTOWSKI@ext.ec.europa.eu>
Date: Fri, 16 Jun 2017 11:35:23 +0200
Subject: [PATCH] Merge branch 'development'
---
.../smp/server/security/BlueCoatAuthenticationFilter.java | 0
.../eu/europa/ec/cipa/smp/server/util/ExtensionUtils.java | 3 +--
.../smp/server/security/BlueCoatAuthenticationFilterTest.java | 0
.../eu/europa/ec/cipa/smp/server/util/ExtensionUtilsTest.java | 4 +---
.../eu/europa/ec/cipa/smp/server/util/extensionMarshal.xml | 2 +-
.../europa/ec/cipa/smp/server/util/extensionMarshalMore.xml | 2 +-
6 files changed, 4 insertions(+), 7 deletions(-)
create mode 100644 smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/BlueCoatAuthenticationFilter.java
create mode 100644 smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/BlueCoatAuthenticationFilterTest.java
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/BlueCoatAuthenticationFilter.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/BlueCoatAuthenticationFilter.java
new file mode 100644
index 000000000..e69de29bb
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtils.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtils.java
index a1d25860c..e4751b260 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtils.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtils.java
@@ -33,7 +33,6 @@ import javax.xml.transform.stream.StreamSource;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -102,4 +101,4 @@ public class ExtensionUtils {
return Collections.emptyList();
}
}
-}
+}
\ No newline at end of file
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/BlueCoatAuthenticationFilterTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/BlueCoatAuthenticationFilterTest.java
new file mode 100644
index 000000000..e69de29bb
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtilsTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtilsTest.java
index 65ea94faa..4818c999e 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtilsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtilsTest.java
@@ -127,6 +127,4 @@ public class ExtensionUtilsTest {
number++;
}
}
-
-
-}
+}
\ No newline at end of file
diff --git a/smp-server-library/src/test/resources/eu/europa/ec/cipa/smp/server/util/extensionMarshal.xml b/smp-server-library/src/test/resources/eu/europa/ec/cipa/smp/server/util/extensionMarshal.xml
index 226b4a7b5..85968f7a6 100644
--- a/smp-server-library/src/test/resources/eu/europa/ec/cipa/smp/server/util/extensionMarshal.xml
+++ b/smp-server-library/src/test/resources/eu/europa/ec/cipa/smp/server/util/extensionMarshal.xml
@@ -6,4 +6,4 @@
<ExtensionVersionID>versionId1</ExtensionVersionID>
<ExtensionReasonCode>reasonCode1</ExtensionReasonCode>
<ExtensionReason>reason1</ExtensionReason>
-</Extension>
+</Extension>
\ No newline at end of file
diff --git a/smp-server-library/src/test/resources/eu/europa/ec/cipa/smp/server/util/extensionMarshalMore.xml b/smp-server-library/src/test/resources/eu/europa/ec/cipa/smp/server/util/extensionMarshalMore.xml
index a1aafe933..036ad5763 100644
--- a/smp-server-library/src/test/resources/eu/europa/ec/cipa/smp/server/util/extensionMarshalMore.xml
+++ b/smp-server-library/src/test/resources/eu/europa/ec/cipa/smp/server/util/extensionMarshalMore.xml
@@ -15,4 +15,4 @@
<ExtensionVersionID>versionId2</ExtensionVersionID>
<ExtensionReasonCode>reasonCode2</ExtensionReasonCode>
<ExtensionReason>reason2</ExtensionReason>
-</Extension>
+</Extension>
\ No newline at end of file
--
GitLab