Replace hypersistence JsonBinaryType with Hibernate's SqlTypes.JSON

Author: BobanL

backend/src/main/java/gov/cdc/usds/simplereport/db/model/OrganizationQueueItem.java

@@ -1,7 +1,6 @@
 package gov.cdc.usds.simplereport.db.model;
 
 import gov.cdc.usds.simplereport.api.model.accountrequest.OrganizationAccountRequest;
-import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -10,7 +9,8 @@
 import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Type;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 import org.springframework.boot.context.properties.bind.ConstructorBinding;
 
 @Entity
@@ -26,7 +26,7 @@ public class OrganizationQueueItem extends EternalAuditedEntity {
   private String externalId;
 
   @Column(nullable = false)
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   private OrganizationAccountRequest requestData;
 
   @OneToOne(optional = true, fetch = FetchType.LAZY)

backend/src/main/java/gov/cdc/usds/simplereport/db/model/PatientAnswers.java

@@ -1,15 +1,15 @@
 package gov.cdc.usds.simplereport.db.model;
 
 import gov.cdc.usds.simplereport.db.model.auxiliary.AskOnEntrySurvey;
-import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import org.hibernate.annotations.Type;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 @Entity
 public class PatientAnswers extends AuditedEntity {
   @Column
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   private AskOnEntrySurvey askOnEntry;
 
   protected PatientAnswers() {

backend/src/main/java/gov/cdc/usds/simplereport/db/model/Person.java

@@ -9,7 +9,6 @@
 import gov.cdc.usds.simplereport.db.model.auxiliary.StreetAddress;
 import gov.cdc.usds.simplereport.db.model.auxiliary.TestResultDeliveryPreference;
 import io.hypersistence.utils.hibernate.type.array.ListArrayType;
-import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
@@ -75,7 +74,7 @@ public class Person extends OrganizationScopedEternalEntity implements PersonEnt
    * https://github.com/CDCgov/prime-data-hub/blob/master/prime-router/metadata/valuesets/tribal.valuesets
    */
   @Getter
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   @Column
   private List<String> tribalAffiliation;
 

backend/src/main/java/gov/cdc/usds/simplereport/db/model/TenantDataAccess.java

@@ -1,14 +1,14 @@
 package gov.cdc.usds.simplereport.db.model;
 
 import gov.cdc.usds.simplereport.db.model.auxiliary.PermissionsData;
-import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import java.util.Date;
-import org.hibernate.annotations.Type;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 @Entity
 public class TenantDataAccess extends EternalAuditedEntity {
@@ -25,7 +25,7 @@ public class TenantDataAccess extends EternalAuditedEntity {
 
   // contains the authorities to be loaded into Authentication
   @Column(nullable = false)
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   private PermissionsData permissionsData;
 
   @Column(nullable = false)

backend/src/main/java/gov/cdc/usds/simplereport/db/model/TestEvent.java

@@ -9,7 +9,6 @@
 import gov.cdc.usds.simplereport.db.model.auxiliary.AskOnEntrySurvey;
 import gov.cdc.usds.simplereport.db.model.auxiliary.TestCorrectionStatus;
 import gov.cdc.usds.simplereport.db.model.auxiliary.TestResult;
-import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
@@ -27,7 +26,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.Immutable;
-import org.hibernate.annotations.Type;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 @Getter
 @Entity
@@ -38,15 +38,15 @@
 @Slf4j
 public class TestEvent extends BaseTestInfo {
   @Column
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   private Person patientData;
 
   @Column
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   private Provider providerData;
 
   @Column
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   private AskOnEntrySurvey surveyData;
 
   @JsonIgnore

backend/src/main/java/gov/cdc/usds/simplereport/db/model/TestResultUpload.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import gov.cdc.usds.simplereport.db.model.auxiliary.UploadStatus;
 import gov.cdc.usds.simplereport.service.model.reportstream.FeedbackMessage;
-import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -17,7 +16,6 @@
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.annotations.JdbcTypeCode;
-import org.hibernate.annotations.Type;
 import org.hibernate.type.SqlTypes;
 
 @Getter
@@ -43,11 +41,11 @@ public class TestResultUpload extends AuditedEntity {
   private Organization organization;
 
   @Column()
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   private FeedbackMessage[] warnings;
 
   @Column()
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   private FeedbackMessage[] errors;
 
   protected TestResultUpload() {}