diff --git a/pom.xml b/pom.xml
index 0a3a11e6c994e39b6e7fd641334df22099b500e0..8facdc85456b061325f5c7f798e7b3d1455fff19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,11 +96,6 @@
spring-boot-starter-data-jpa
-
-
-
-
-
org.flowable
flowable-spring-boot-starter
@@ -114,8 +109,6 @@
-
-
org.springframework.boot
@@ -137,6 +130,7 @@
pooled-jms
+
org.apache.camel.springboot
@@ -174,16 +168,13 @@
camel-stream
-
-
com.fasterxml.jackson.core
jackson-databind
-
-
+
org.springframework.security
spring-security-web
@@ -225,9 +216,6 @@
-
-
-
com.h2database
h2
@@ -254,8 +242,6 @@
-
-
org.springframework.boot
spring-boot-starter-test
@@ -288,7 +274,6 @@
test
-
org.apache.activemq
activemq-broker
@@ -296,6 +281,13 @@
+
+
+ javax.jms
+ javax.jms-api
+ 2.0.1
+
+
diff --git a/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java b/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java
index c1ec1fed466d4fdcaf6811256cfb7db6167b08a0..fcb31d3b791bf6efbd2bb03365b0e9e551b5a0c4 100644
--- a/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java
+++ b/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java
@@ -30,11 +30,8 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
import org.apache.commons.io.IOUtils;
-import org.etsi.osl.oas.AlarmHandling;
-import org.etsi.osl.oas.OasSpingBoot;
import org.etsi.osl.oas.model.Action;
import org.etsi.osl.oas.model.ActionCharacteristic;
import org.etsi.osl.oas.model.ActionParam;
@@ -101,7 +98,7 @@ public class RulesIntegrationTest {
@WithMockUser(username = "osadmin", roles = { "ADMIN", "USER" })
@Test
- public void testRuleCreateAndUpdate() throws UnsupportedEncodingException, IOException, Exception {
+ public void testRuleCreateAndUpdate() throws Exception {
ActionSpecificationCreate actionCreate = new ActionSpecificationCreate();
actionCreate.setName("scaleEqually");
@@ -211,7 +208,7 @@ public class RulesIntegrationTest {
scope.setEntityUUID("UUIDREFTEST2");
rule.setScope(scope);
- responseRule = mvc
+ mvc
.perform(MockMvcRequestBuilders.post("/assuranceServicesManagement/v1/ruleSpecification")
.with(SecurityMockMvcRequestPostProcessors.csrf()).contentType(MediaType.APPLICATION_JSON)
.content(toJson(rule)))
@@ -229,7 +226,7 @@ public class RulesIntegrationTest {
@WithMockUser(username = "osadmin", roles = { "ADMIN", "USER" })
@Test
- public void testRuleCreateFromFiles() throws UnsupportedEncodingException, IOException, Exception {
+ public void testRuleCreateFromFiles() throws Exception {
File faction = new File( "src/test/resources/testAction.json" );
InputStream in = new FileInputStream( faction );
@@ -422,22 +419,10 @@ public class RulesIntegrationTest {
return mapper.writeValueAsBytes(object);
}
- static String toJsonString(Object object) throws IOException {
- ObjectMapper mapper = new ObjectMapper();
- mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
- return mapper.writeValueAsString(object);
- }
-
static T toJsonObj(String content, Class valueType) throws IOException {
ObjectMapper mapper = new ObjectMapper();
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
return mapper.readValue(content, valueType);
}
- static T toJsonObj(InputStream content, Class valueType) throws IOException {
- ObjectMapper mapper = new ObjectMapper();
- mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
- return mapper.readValue(content, valueType);
- }
-
}