From 97d9f66df456ef4573047a90baa3cc3ee4bfb0b7 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 8 Jul 2019 18:35:07 +0300
Subject: Merge from ecomp 718fd196 - Ext. Services Simulator

Issue-ID: VID-378

Change-Id: Ib4430bf23d109e6fdfe38c55e55b7d3b96fff3af
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../src/main/java/org/onap/simulator/db/entities/App.java        | 3 ++-
 .../src/main/java/org/onap/simulator/db/entities/Role.java       | 9 +++------
 .../main/java/org/onap/simulator/db/entities/RoleFunction.java   | 2 +-
 .../src/main/java/org/onap/simulator/db/entities/User.java       | 9 +++------
 .../src/main/java/org/onap/simulator/db/entities/UserApp.java    | 6 +-----
 5 files changed, 10 insertions(+), 19 deletions(-)

(limited to 'vid-ext-services-simulator/src/main/java/org/onap/simulator/db')

diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/App.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/App.java
index 222e753c4..56aafaa31 100644
--- a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/App.java
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/App.java
@@ -1,9 +1,10 @@
 package org.onap.simulator.db.entities;
 
+import org.hibernate.annotations.Type;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import org.hibernate.annotations.Type;
 
 @Entity(name = "fn_app")
 public class App {
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/Role.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/Role.java
index 8b09d1f57..85d7e2810 100644
--- a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/Role.java
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/Role.java
@@ -1,13 +1,10 @@
 package org.onap.simulator.db.entities;
 
-import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
 import org.hibernate.annotations.Type;
 
+import javax.persistence.*;
+import java.util.Set;
+
 @Entity(name = "fn_role")
 public class Role {
     @Id
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/RoleFunction.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/RoleFunction.java
index addda5363..0765b69a4 100644
--- a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/RoleFunction.java
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/RoleFunction.java
@@ -1,9 +1,9 @@
 package org.onap.simulator.db.entities;
 
-import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import java.io.Serializable;
 
 @Entity(name = "fn_role_function")
 public class RoleFunction implements Serializable {
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/User.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/User.java
index 349845f36..6108f8c59 100644
--- a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/User.java
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/User.java
@@ -1,13 +1,10 @@
 package org.onap.simulator.db.entities;
 
+import org.hibernate.annotations.Type;
+
+import javax.persistence.*;
 import java.math.BigDecimal;
 import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import org.hibernate.annotations.Type;
 
 @Entity(name = "fn_user")
 public class User {
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/UserApp.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/UserApp.java
index e4eba7940..dfb6c056f 100644
--- a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/UserApp.java
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/UserApp.java
@@ -1,11 +1,7 @@
 package org.onap.simulator.db.entities;
 
+import javax.persistence.*;
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 
 @Entity(name = "fn_user_role")
 public class UserApp implements Serializable {
-- 
cgit 1.2.3-korg