This is an automated email from the ASF dual-hosted git repository.
jsinovassinnaik pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/unomi.git
commit b1444b2d466a76a7ead300360446ed8f772bd0b8
Author: jsinovassin <jsinovassinn...@jahia.com>
AuthorDate: Mon May 6 16:01:20 2024 +0300
UNOMI-829: remove some usages of javax.validation
---
.../java/org/apache/unomi/api/ContextRequest.java | 5 -----
.../apache/unomi/api/EventsCollectorRequest.java | 7 -------
.../apache/unomi/api/utils/ValidationPattern.java | 22 ----------------------
.../rest/ImportConfigurationServiceEndPoint.java | 1 -
pom.xml | 18 +-----------------
5 files changed, 1 insertion(+), 52 deletions(-)
diff --git a/api/src/main/java/org/apache/unomi/api/ContextRequest.java
b/api/src/main/java/org/apache/unomi/api/ContextRequest.java
index 319afd005..3f7a10d79 100644
--- a/api/src/main/java/org/apache/unomi/api/ContextRequest.java
+++ b/api/src/main/java/org/apache/unomi/api/ContextRequest.java
@@ -24,9 +24,6 @@ import org.apache.unomi.api.services.EventListenerService;
import org.apache.unomi.api.services.PersonalizationService;
import org.apache.unomi.api.services.ProfileService;
import org.apache.unomi.api.services.RulesService;
-import org.apache.unomi.api.utils.ValidationPattern;
-
-import javax.validation.constraints.Pattern;
import java.util.List;
import java.util.Map;
@@ -68,10 +65,8 @@ public class ContextRequest {
private Profile profileOverrides;
private Map<String, Object> sessionPropertiesOverrides;
- @Pattern(regexp = ValidationPattern.TEXT_VALID_CHARACTERS_PATTERN)
private String sessionId;
- @Pattern(regexp = ValidationPattern.TEXT_VALID_CHARACTERS_PATTERN)
private String profileId;
private String clientId;
diff --git a/api/src/main/java/org/apache/unomi/api/EventsCollectorRequest.java
b/api/src/main/java/org/apache/unomi/api/EventsCollectorRequest.java
index 74f922eec..bdf012de6 100644
--- a/api/src/main/java/org/apache/unomi/api/EventsCollectorRequest.java
+++ b/api/src/main/java/org/apache/unomi/api/EventsCollectorRequest.java
@@ -17,10 +17,6 @@
package org.apache.unomi.api;
-import org.apache.unomi.api.utils.ValidationPattern;
-import org.hibernate.validator.constraints.NotEmpty;
-
-import javax.validation.constraints.Pattern;
import java.util.List;
/**
@@ -28,13 +24,10 @@ import java.util.List;
*/
public class EventsCollectorRequest {
- @NotEmpty
private List<Event> events;
- @Pattern(regexp = ValidationPattern.TEXT_VALID_CHARACTERS_PATTERN)
private String sessionId;
- @Pattern(regexp = ValidationPattern.TEXT_VALID_CHARACTERS_PATTERN)
private String profileId;
/**
diff --git
a/api/src/main/java/org/apache/unomi/api/utils/ValidationPattern.java
b/api/src/main/java/org/apache/unomi/api/utils/ValidationPattern.java
deleted file mode 100644
index 61c74d6d3..000000000
--- a/api/src/main/java/org/apache/unomi/api/utils/ValidationPattern.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.api.utils;
-
-public class ValidationPattern {
-
- public static final String TEXT_VALID_CHARACTERS_PATTERN =
"^(\\w|[-_@\\.]){0,60}$";
-}
diff --git
a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
index ad943e9fa..db0f15159 100644
---
a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
+++
b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
@@ -20,7 +20,6 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.ext.multipart.Multipart;
import org.apache.cxf.rs.security.cors.CrossOriginResourceSharing;
import org.apache.unomi.api.services.ConfigSharingService;
-import org.apache.unomi.api.utils.ValidationPattern;
import org.apache.unomi.router.api.ImportConfiguration;
import org.apache.unomi.router.api.RouterConstants;
import org.apache.unomi.router.api.services.ImportExportConfigurationService;
diff --git a/pom.xml b/pom.xml
index 5be302b18..abffa3a23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
<elasticsearch.test.version>7.11.0</elasticsearch.test.version>
<lucene.version>8.2.0</lucene.version>
<groovy.version>3.0.3</groovy.version>
- <networknt.version>1.0.49</networknt.version>
+ <networknt.version>1.4.0</networknt.version>
<bean.validation.version>1.1.0.Final</bean.validation.version>
<hibernate.validator.version>5.4.3.Final</hibernate.validator.version>
@@ -87,7 +87,6 @@
<scala.version>2.12.6</scala.version>
<encoding>UTF-8</encoding>
- <gatling.version>2.1.2</gatling.version>
<scala-maven-plugin.version>4.3.0</scala-maven-plugin.version>
<!-- Librairies for Karaf packaging -->
@@ -953,21 +952,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>io.gatling</groupId>
- <artifactId>gatling-app</artifactId>
- <version>${gatling.version}</version>
- </dependency>
- <dependency>
- <groupId>io.gatling</groupId>
- <artifactId>gatling-recorder</artifactId>
- <version>${gatling.version}</version>
- </dependency>
- <dependency>
- <groupId>io.gatling.highcharts</groupId>
- <artifactId>gatling-charts-highcharts</artifactId>
- <version>${gatling.version}</version>
- </dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
