1 files changed, 19 insertions, 3 deletions
diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Db.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Db.java
index da1f6cab..d84b34f8 100644
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Db.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Db.java
@@ -24,10 +24,13 @@ import java.util.Set;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import lombok.Getter;
@@ -46,6 +49,10 @@ import lombok.Setter;
 @Table(name = "db")
 public class Db {
 	@Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "`id`")
+    private Integer id;
+
 	@Column(name="`name`")
 	private String name;
 
@@ -79,13 +86,17 @@ public class Db {
 	@Column(name="`property3`")
 	private String property3;
 
+	@ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name = "db_type_id", nullable = false)
+	private DbType dbType;
+	
 	@JsonBackReference
 	@ManyToMany(fetch = FetchType.EAGER)
 	@JoinTable(	name 				= "map_db_topic",
-			joinColumns 		= {  @JoinColumn(name="db_name")  },
-			inverseJoinColumns 	= {  @JoinColumn(name="topic_name")  }
+			joinColumns 		= {  @JoinColumn(name="db_id")  },
+			inverseJoinColumns 	= {  @JoinColumn(name="topic_id")  }
 	)
-	protected Set<Topic> topics;
+	private Set<Topic> topics;
 
 	public Db() {
 	}
@@ -95,6 +106,11 @@ public class Db {
 	}
 
 	@Override
+	public String toString() {
+		return String.format("Db %s (name=%, enabled=%s)", id, name, enabled);
+	}
+
+	@Override
 	public boolean equals(Object obj) {
 		if (obj == null)
 			return false;