summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Mizyn <d.mizyn@samsung.com>2019-12-17 12:37:32 +0100
committerDominik Mizyn <d.mizyn@samsung.com>2019-12-17 12:39:38 +0100
commit2b436dba4b7c12e8c97f040753d0d5044d580b8d (patch)
treef45295b686364fb7a1af27c9a6e6db000a0357cd
parentffd9af970318c1f5a0bad46d7aad5d4611414aae (diff)
Deprecated class and annotation change
javax.validation.constraints.Email, javax.validation.constraints.NotBlank in ProfileDetail.java class changed to import org.hibernate.validator.constraints.Email, import org.hibernate.validator.constraints.NotBlank Minor change: @RunWith(MockitoJUnitRunner.class) -> @RunWith(SpringRunner.class) Issue-ID: PORTAL-710 Change-Id: I9e249ea293ec05b212d431e6fe877a98f3798ffc Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
-rw-r--r--portal-BE/pom.xml53
-rw-r--r--portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ProfileDetail.java5
-rw-r--r--portal-BE/src/test/java/org/onap/portal/framework/MockitoTestSuite.java11
3 files changed, 18 insertions, 51 deletions
diff --git a/portal-BE/pom.xml b/portal-BE/pom.xml
index a882f751..94340971 100644
--- a/portal-BE/pom.xml
+++ b/portal-BE/pom.xml
@@ -141,54 +141,21 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>2.0.0-rc2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>2.0.0-rc2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>1.5.20</version>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>2.0.0-rc2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>1.5.20</version>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>2.0.0-rc2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>2.0.0-rc2</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>3.3.4</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>6.0.18.Final</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
- <version>1.5.20</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-client</artifactId>
- <version>3.3.4</version>
+ <version>1.5.13</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ProfileDetail.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ProfileDetail.java
index 9024bddb..41e6a3ec 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ProfileDetail.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ProfileDetail.java
@@ -40,15 +40,14 @@
package org.onap.portal.domain.dto.transport;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
+import org.hibernate.validator.constraints.Email;
+import org.hibernate.validator.constraints.NotBlank;
@Setter
@Getter
diff --git a/portal-BE/src/test/java/org/onap/portal/framework/MockitoTestSuite.java b/portal-BE/src/test/java/org/onap/portal/framework/MockitoTestSuite.java
index 1825e401..49c4829b 100644
--- a/portal-BE/src/test/java/org/onap/portal/framework/MockitoTestSuite.java
+++ b/portal-BE/src/test/java/org/onap/portal/framework/MockitoTestSuite.java
@@ -37,16 +37,17 @@
*/
package org.onap.portal.framework;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.springframework.test.context.junit4.SpringRunner;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(SpringRunner.class)
public class MockitoTestSuite {