From a68bf8934f3b67a54241e5bfc8f5b784ae9286a8 Mon Sep 17 00:00:00 2001 From: George Tziavas Date: Fri, 5 Jan 2024 13:56:26 +0200 Subject: [PATCH 1/4] added anotation for the column name in order to escape mysql reserved word 'value' --- .../java/org/etsi/osl/oas/model/ActionCharacteristic.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/etsi/osl/oas/model/ActionCharacteristic.java b/src/main/java/org/etsi/osl/oas/model/ActionCharacteristic.java index ad9a371..c3157b9 100644 --- a/src/main/java/org/etsi/osl/oas/model/ActionCharacteristic.java +++ b/src/main/java/org/etsi/osl/oas/model/ActionCharacteristic.java @@ -2,6 +2,7 @@ package org.etsi.osl.oas.model; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.Column; import org.hibernate.annotations.GenericGenerator; import org.springframework.validation.annotation.Validated; @@ -16,7 +17,7 @@ import lombok.Data; * * */ -@Schema(description = "An ActionCharacteristic is an entity that describes the values of the characteristics of ana ction in a rule.") +@Schema(description = "An ActionCharacteristic is an entity that describes the values of the characteristics of an action in a rule.") @Validated @Entity(name = "OASActionCharacteristic") @@ -33,5 +34,6 @@ public class ActionCharacteristic { protected String name = null; @JsonProperty("value") + @Column(name = "\"value\"") protected String value = null; } -- GitLab From 03e577631ae8540cfb13cc62fa59e54583ca42f4 Mon Sep 17 00:00:00 2001 From: George Tziavas Date: Fri, 5 Jan 2024 14:07:20 +0200 Subject: [PATCH 2/4] Added javax.jms to pom Removed unused imports --- pom.xml | 26 +++++++------------ .../etsi/osl/oas/RulesIntegrationTest.java | 2 -- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 0a3a11e..8facdc8 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 c1ec1fe..abd041f 100644 --- a/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java +++ b/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java @@ -33,8 +33,6 @@ 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; -- GitLab From 63ce3c9359b087a430c0f82205ff74a67a373036 Mon Sep 17 00:00:00 2001 From: George Tziavas Date: Fri, 5 Jan 2024 14:09:55 +0200 Subject: [PATCH 3/4] Removed unused methods --- .../org/etsi/osl/oas/RulesIntegrationTest.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java b/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java index abd041f..5e694aa 100644 --- a/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java +++ b/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java @@ -99,7 +99,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"); @@ -227,7 +227,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 ); @@ -419,23 +419,11 @@ public class RulesIntegrationTest { mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); 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); - } - } -- GitLab From 251fd6fff9d0c6f52be2acb6b13b0754194ee0c5 Mon Sep 17 00:00:00 2001 From: George Tziavas Date: Fri, 5 Jan 2024 14:11:48 +0200 Subject: [PATCH 4/4] Minor code impovements --- src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java b/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java index 5e694aa..fcb31d3 100644 --- a/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java +++ b/src/test/java/org/etsi/osl/oas/RulesIntegrationTest.java @@ -30,7 +30,6 @@ 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.model.Action; @@ -209,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))) @@ -419,7 +418,7 @@ public class RulesIntegrationTest { mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); return mapper.writeValueAsBytes(object); } - + static T toJsonObj(String content, Class valueType) throws IOException { ObjectMapper mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); -- GitLab