fully qualify database objects

ministryofjustice · Jan 20, 2025 · 3475b4a · 3475b4a
1 parent 2ba0f6f
commit 3475b4a
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -95,3 +95,5 @@ test-results/
 
 # Snyk
 .dccache
+
+assessment-service/src/main/resources/application-secret.yml
diff --git a/...ssment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaAssessmentLog.java b/...ssment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaAssessmentLog.java
@@ -3,7 +3,6 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import jakarta.persistence.Lob;
 import jakarta.persistence.Table;
 import java.time.LocalDateTime;
 import lombok.Getter;
@@ -13,7 +12,7 @@
  * Represents the OPA Assessment Log.
  */
 @Entity
-@Table(name = "XXCCMS_OPA_ASSESSMENT_LOG")
+@Table(name = "XXCCMS_OPA_ASSESSMENT_LOG", schema = "XXCCMS_PUI")
 @Getter
 @Setter
 public class OpaAssessmentLog {

diff --git a/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaAttribute.java b/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaAttribute.java
@@ -18,11 +18,12 @@
  * Represents an attribute of an Oracle Intelligence Advisor entity.
  */
 @Entity
-@Table(name = "XXCCMS_OPA_ATTRIBUTE")
+@Table(name = "XXCCMS_OPA_ATTRIBUTE", schema = "XXCCMS_PUI")
 @SequenceGenerator(
     allocationSize = 1,
     name = "XXCCMS_OPA_ATTRIBUTE_S",
-    sequenceName = "XXCCMS_OPA_GENERATED_ID_S")
+    sequenceName = "XXCCMS_OPA_GENERATED_ID_S",
+    schema = "XXCCMS_PUI")
 @Getter
 @Setter
 public class OpaAttribute {

diff --git a/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaCheckpoint.java b/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaCheckpoint.java
@@ -16,7 +16,7 @@
  * Represents an Oracle Intelligence Advisor Checkpoint.
  */
 @Entity
-@Table(name = "XXCCMS_OPA_CHECKPOINT")
+@Table(name = "XXCCMS_OPA_CHECKPOINT", schema = "XXCCMS_PUI")
 @Getter
 @Setter
 public class OpaCheckpoint {

diff --git a/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaEntity.java b/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaEntity.java
@@ -21,11 +21,12 @@
  * Represents an Oracle Intelligence Advisor entity.
  */
 @Entity
-@Table(name = "XXCCMS_OPA_ENTITY")
+@Table(name = "XXCCMS_OPA_ENTITY", schema = "XXCCMS_PUI")
 @SequenceGenerator(
     allocationSize = 1,
     name = "XXCCMS_OPA_ENTITY_S",
-    sequenceName = "XXCCMS_OPA_GENERATED_ID_S")
+    sequenceName = "XXCCMS_OPA_GENERATED_ID_S",
+    schema = "XXCCMS_PUI")
 @Getter
 @Setter
 public class OpaEntity {

diff --git a/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaListEntity.java b/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaListEntity.java
@@ -19,11 +19,12 @@
  * Represents an Oracle Intelligence Advisor list entity.
  */
 @Entity
-@Table(name = "XXCCMS_OPA_LISTENTITY")
+@Table(name = "XXCCMS_OPA_LISTENTITY", schema = "XXCCMS_PUI")
 @SequenceGenerator(
     allocationSize = 1,
     name = "XXCCMS_OPA_LIST_ENTITY_S",
-    sequenceName = "XXCCMS_OPA_GENERATED_ID_S")
+    sequenceName = "XXCCMS_OPA_GENERATED_ID_S",
+    schema = "XXCCMS_PUI")
 @Getter
 @Setter
 public class OpaListEntity {

diff --git a/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaRelationship.java b/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaRelationship.java
@@ -22,11 +22,12 @@
  * Represents an Oracle Intelligence Advisor relationship.
  */
 @Entity
-@Table(name = "XXCCMS_OPA_RELATIONSHIP")
+@Table(name = "XXCCMS_OPA_RELATIONSHIP", schema = "XXCCMS_PUI")
 @SequenceGenerator(
     allocationSize = 1,
     name = "XXCCMS_OPA_RELATIONSHIP_S",
-    sequenceName = "XXCCMS_OPA_GENERATED_ID_S")
+    sequenceName = "XXCCMS_OPA_GENERATED_ID_S",
+    schema = "XXCCMS_PUI")
 @Getter
 @Setter
 public class OpaRelationship {

diff --git a/...t-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaRelationshipTarget.java b/...t-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaRelationshipTarget.java
@@ -13,11 +13,12 @@
  * Represents an Oracle Intelligence Advisor relationship target.
  */
 @Entity
-@Table(name = "XXCCMS_OPA_RELSHIPTARGET")
+@Table(name = "XXCCMS_OPA_RELSHIPTARGET", schema = "XXCCMS_PUI")
 @SequenceGenerator(
     allocationSize = 1,
     name = "XXCCMS_OPA_RELATIONSHIP_TARGET_S",
-    sequenceName = "XXCCMS_OPA_GENERATED_ID_S")
+    sequenceName = "XXCCMS_OPA_GENERATED_ID_S",
+    schema = "XXCCMS_PUI")
 @Getter
 @Setter
 public class OpaRelationshipTarget {

diff --git a/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaSession.java b/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaSession.java
@@ -21,11 +21,12 @@
  * Represents an Oracle Intelligence Advisor session.
  */
 @Entity
-@Table(name = "XXCCMS_OPA_SESSION")
+@Table(name = "XXCCMS_OPA_SESSION", schema = "XXCCMS_PUI")
 @SequenceGenerator(
     allocationSize = 1,
     name = "XXCCMS_OPASESSION_GENERATED_ID_S",
-    sequenceName = "XXCCMS_OPA_GENERATED_ID_S")
+    sequenceName = "XXCCMS_OPA_GENERATED_ID_S",
+    schema = "XXCCMS_PUI")
 @Getter
 @Setter
 @EntityListeners(AuditingEntityListener.class)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -95,3 +95,5 @@ test-results/

		# Snyk
		.dccache

		assessment-service/src/main/resources/application-secret.yml