From 3475b4a11c124ae24181a65e8a6e33db8ec60315 Mon Sep 17 00:00:00 2001 From: farrell-m Date: Mon, 20 Jan 2025 14:06:15 +0000 Subject: [PATCH] fully qualify database objects --- .gitignore | 2 ++ .../laa/ccms/caab/assessment/entity/OpaAssessmentLog.java | 3 +-- .../uk/gov/laa/ccms/caab/assessment/entity/OpaAttribute.java | 5 +++-- .../gov/laa/ccms/caab/assessment/entity/OpaCheckpoint.java | 2 +- .../uk/gov/laa/ccms/caab/assessment/entity/OpaEntity.java | 5 +++-- .../gov/laa/ccms/caab/assessment/entity/OpaListEntity.java | 5 +++-- .../gov/laa/ccms/caab/assessment/entity/OpaRelationship.java | 5 +++-- .../ccms/caab/assessment/entity/OpaRelationshipTarget.java | 5 +++-- .../uk/gov/laa/ccms/caab/assessment/entity/OpaSession.java | 5 +++-- 9 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index bf34eca..0494113 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,5 @@ test-results/ # Snyk .dccache + +assessment-service/src/main/resources/application-secret.yml diff --git a/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaAssessmentLog.java b/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaAssessmentLog.java index 0038646..56e3bac 100644 --- a/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaAssessmentLog.java +++ b/assessment-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 index b5f0256..8f71ea7 100644 --- 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 index 0208587..5eed68a 100644 --- 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 index 05584eb..815805f 100644 --- 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 index 7afe127..deef9ed 100644 --- 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 index ac879a2..a495f4f 100644 --- 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/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaRelationshipTarget.java b/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaRelationshipTarget.java index 0b06002..305d13b 100644 --- a/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaRelationshipTarget.java +++ b/assessment-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 index 13f2706..22142f5 100644 --- 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)