Merge "Blueprintprocessor Table change."

5 files changed, 29 insertions, 29 deletions

diff --git a/ms/blueprintsprocessor/application/src/main/resources/sql/schema-local.sql b/ms/blueprintsprocessor/application/src/main/resources/sql/schema-local.sql
index ad048b017..05df4200a 100644
--- a/ms/blueprintsprocessor/application/src/main/resources/sql/schema-local.sql
+++ b/ms/blueprintsprocessor/application/src/main/resources/sql/schema-local.sql
@@ -6,8 +6,8 @@
 -- -----------------------------------------------------
 -- table CONFIG_MODEL
 -- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS sdnctl.CONFIG_MODEL (
-  config_model_id 		INT(11) NOT NULL AUTO_INCREMENT,
+CREATE TABLE IF NOT EXISTS sdnctl.BLUEPRINT_MODEL (
+  blueprint_model_id 		VARCHAR(50) NOT NULL,
   service_uuid 			VARCHAR(50) NULL DEFAULT NULL,
   distribution_id 		VARCHAR(50) NULL DEFAULT NULL,
   service_name 			VARCHAR(255) NULL DEFAULT NULL,
@@ -27,25 +27,25 @@ CREATE TABLE IF NOT EXISTS sdnctl.CONFIG_MODEL (
   published 			varchar(1) not null,
   updated_by 			varchar(100) not null,
   tags 				longtext null default null,
-  primary key PK_CONFIG_MODEL (config_model_id),
-  UNIQUE KEY UK_CONFIG_MODEL (artifact_name , artifact_version)
+  primary key PK_BLUEPRINT_MODEL (blueprint_model_id),
+  UNIQUE KEY UK_BLUEPRINT_MODEL (artifact_name , artifact_version)
 ) ENGINE=InnoDB;
 
 
 -- -----------------------------------------------------
 -- table CONFIG_MODEL_CONTENT
 -- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS sdnctl.CONFIG_MODEL_CONTENT (
-  config_model_content_id 	INT(11) NOT NULL AUTO_INCREMENT, 
-  config_model_id 		INT NOT NULL,
+CREATE TABLE IF NOT EXISTS sdnctl.BLUEPRINT_MODEL_CONTENT (
+  blueprint_model_content_id 	VARCHAR(50) NOT NULL,
+  blueprint_model_id 		VARCHAR(50) NOT NULL,
   name 				VARCHAR(100) NOT NULL,
   content_type 			VARCHAR(50) NOT NULL,
   description 			LONGTEXT NULL DEFAULT NULL,
   updated_date 			DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  content 			LONGTEXT NULL DEFAULT NULL,
-  PRIMARY KEY PK_CONFIG_MODEL_CONTENT (config_model_content_id),
-  UNIQUE KEY UK_CONFIG_MODEL_CONTENT (config_model_id, name, content_type),
-  FOREIGN KEY FK_CONFIG_MODEL_CONTENT (config_model_id) REFERENCES sdnctl.CONFIG_MODEL(config_model_id) ON DELETE CASCADE
+  content 			LONGBLOB NULL DEFAULT NULL,
+  PRIMARY KEY PK_BLUEPRINT_MODEL_CONTENT (blueprint_model_content_id),
+  UNIQUE KEY UK_BLUEPRINT_MODEL_CONTENT (blueprint_model_id, name, content_type),
+  FOREIGN KEY FK_BLUEPRINT_MODEL_CONTENT (blueprint_model_id) REFERENCES sdnctl.BLUEPRINT_MODEL(blueprint_model_id) ON DELETE CASCADE
 ) ENGINE=InnoDB;
 
 -- -----------------------------------------------------
diff --git a/ms/blueprintsprocessor/application/src/main/resources/sql/schema.sql b/ms/blueprintsprocessor/application/src/main/resources/sql/schema.sql
index 58564dce5..8bf39eed2 100644
--- a/ms/blueprintsprocessor/application/src/main/resources/sql/schema.sql
+++ b/ms/blueprintsprocessor/application/src/main/resources/sql/schema.sql
@@ -1,8 +1,8 @@
 -- -----------------------------------------------------
 -- table CONFIG_MODEL
 -- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS configurator.CONFIG_MODEL (
-  config_model_id 		INT(11) NOT NULL AUTO_INCREMENT,
+CREATE TABLE IF NOT EXISTS configurator.BLUEPRINT_MODEL (
+  blueprint_model_id 		VARCHAR(50) NOT NULL,
   service_uuid 			VARCHAR(50) NULL DEFAULT NULL,
   distribution_id 		VARCHAR(50) NULL DEFAULT NULL,
   service_name 			VARCHAR(255) NULL DEFAULT NULL,
@@ -22,25 +22,25 @@ CREATE TABLE IF NOT EXISTS configurator.CONFIG_MODEL (
   published 			varchar(1) not null,
   updated_by 			varchar(100) not null,
   tags 				longtext null default null,
-  primary key PK_CONFIG_MODEL (config_model_id),
-  UNIQUE KEY UK_CONFIG_MODEL (artifact_name , artifact_version)
+  primary key PK_BLUEPRINT_MODEL (blueprint_model_id),
+  UNIQUE KEY UK_BLUEPRINT_MODEL (artifact_name , artifact_version)
 ) ENGINE=InnoDB;
 
 
 -- -----------------------------------------------------
 -- table CONFIG_MODEL_CONTENT
 -- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS configurator.CONFIG_MODEL_CONTENT (
-  config_model_content_id 	INT(11) NOT NULL AUTO_INCREMENT, 
-  config_model_id 		INT NOT NULL,
+CREATE TABLE IF NOT EXISTS configurator.BLUEPRINT_MODEL_CONTENT (
+  blueprint_model_content_id 	VARCHAR(50) NOT NULL,
+  blueprint_model_id 		VARCHAR(50) NOT NULL,
   name 				VARCHAR(100) NOT NULL,
   content_type 			VARCHAR(50) NOT NULL,
   description 			LONGTEXT NULL DEFAULT NULL,
   updated_date 			DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  content 			LONGTEXT NULL DEFAULT NULL,
-  PRIMARY KEY PK_CONFIG_MODEL_CONTENT (config_model_content_id),
-  UNIQUE KEY UK_CONFIG_MODEL_CONTENT (config_model_id, name, content_type),
-  FOREIGN KEY FK_CONFIG_MODEL_CONTENT (config_model_id) REFERENCES configurator.CONFIG_MODEL(config_model_id) ON DELETE CASCADE
+  content 			LONGBLOB NULL DEFAULT NULL,
+  PRIMARY KEY PK_BLUEPRINT_MODEL_CONTENT (blueprint_model_content_id),
+  UNIQUE KEY UK_BLUEPRINT_MODEL_CONTENT (blueprint_model_id, name, content_type),
+  FOREIGN KEY FK_BLUEPRINT_MODEL_CONTENT (blueprint_model_id) REFERENCES configurator.BLUEPRINT_MODEL(blueprint_model_id) ON delete CASCADE
 ) ENGINE=InnoDB;
 
 -- -----------------------------------------------------
diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModel.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModel.kt
index 17ffd5bac..74a611fbb 100755
--- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModel.kt
+++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModel.kt
@@ -34,11 +34,11 @@ import javax.persistence.*
 
 @EntityListeners(AuditingEntityListener::class)
 @Entity
-@Table(name = "CONFIG_MODEL", uniqueConstraints = [UniqueConstraint(columnNames = ["artifact_name", "artifact_version"])])
+@Table(name = "BLUEPRINT_MODEL", uniqueConstraints = [UniqueConstraint(columnNames = ["artifact_name", "artifact_version"])])
 @Proxy(lazy = false)
 class BlueprintModel : Serializable {
     @Id
-    @Column(name = "config_model_id")
+    @Column(name = "blueprint_model_id")
     var id: String? = null
 
     @Column(name = "service_uuid")
diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelContent.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelContent.kt
index e0d26a7ae..bed6e4e38 100644
--- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelContent.kt
+++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelContent.kt
@@ -32,11 +32,11 @@ import javax.persistence.*
  */
 @EntityListeners(AuditingEntityListener::class)
 @Entity
-@Table(name = "CONFIG_MODEL_CONTENT")
+@Table(name = "BLUEPRINT_MODEL_CONTENT")
 class BlueprintModelContent : Serializable {
 
     @Id
-    @Column(name = "config_model_content_id")
+    @Column(name = "blueprint_model_content_id")
     var id: String? = null
 
     @Column(name = "name", nullable = false)
@@ -48,7 +48,7 @@ class BlueprintModelContent : Serializable {
     lateinit var contentType: String
 
     @OneToOne
-    @JoinColumn(name = "config_model_id")
+    @JoinColumn(name = "blueprint_model_id")
     var blueprintModel: BlueprintModel? = null
 
     @Lob
diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelSearch.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelSearch.kt
index f00d5cadf..f47124dd0 100644
--- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelSearch.kt
+++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelSearch.kt
@@ -32,13 +32,13 @@ import javax.persistence.*
  */
 
 @Entity
-@Table(name = "CONFIG_MODEL")
+@Table(name = "BLUEPRINT_MODEL")
 @JsonTypeName("blueprintModel")
 @JsonTypeInfo(include = JsonTypeInfo.As.WRAPPER_OBJECT, use = JsonTypeInfo.Id.NAME)
 class BlueprintModelSearch : Serializable {
 
     @Id
-    @Column(name = "config_model_id")
+    @Column(name = "blueprint_model_id")
     var id: String? = null
 
     @Column(name = "artifact_uuid")