Java 17 Upgrade

[policy/models.git] / models-pap / src / main / java / org / onap / policy / models / pap / persistence / concepts / JpaPolicyAudit.java

diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/persistence/concepts/JpaPolicyAudit.java b/models-pap/src/main/java/org/onap/policy/models/pap/persistence/concepts/JpaPolicyAudit.java
index 35e3856..20af874 100644 (file)
--- a/models-pap/src/main/java/org/onap/policy/models/pap/persistence/concepts/JpaPolicyAudit.java
+++ b/models-pap/src/main/java/org/onap/policy/models/pap/persistence/concepts/JpaPolicyAudit.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021, 2023 Nordix Foundation.
  *  Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,23 +21,24 @@
 
 package org.onap.policy.models.pap.persistence.concepts;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
+import jakarta.persistence.TableGenerator;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.validation.constraints.NotNull;
+import java.io.Serial;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
-import javax.persistence.TableGenerator;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
@@ -63,11 +64,14 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
  *
  */
 @Entity
-@Table(name = "JpaPolicyAudit", indexes = {@Index(name = "JpaPolicyAuditIndex_timestamp", columnList = "timeStamp")})
+@Table(name = "JpaPolicyAudit", indexes = {
+    @Index(name = "JpaPolicyAuditIndex_timestamp", columnList = "timeStamp")
+})
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class JpaPolicyAudit extends PfConcept implements PfAuthorative<PolicyAudit> {
+    @Serial
     private static final long serialVersionUID = -2935734300607322191L;
 
     @Id
@@ -75,7 +79,7 @@ public class JpaPolicyAudit extends PfConcept implements PfAuthorative<PolicyAud
     @GeneratedValue(strategy = GenerationType.TABLE, generator = "auditIdGen")
     @TableGenerator(
         name = "auditIdGen",
-        table = "sequence",
+        table = "audit_sequence",
         pkColumnName = "SEQ_NAME",
         valueColumnName = "SEQ_COUNT",
         pkColumnValue = "SEQ_GEN")
@@ -105,7 +109,7 @@ public class JpaPolicyAudit extends PfConcept implements PfAuthorative<PolicyAud
     private Date timeStamp;
 
     @Column
-    private String user;
+    private String userName;
 
     /**
      * Default constructor.
@@ -137,7 +141,7 @@ public class JpaPolicyAudit extends PfConcept implements PfAuthorative<PolicyAud
         this.pdpType = copyConcept.getPdpType();
         this.action = copyConcept.getAction();
         this.timeStamp = copyConcept.getTimeStamp();
-        this.user = copyConcept.getUser();
+        this.userName = copyConcept.getUserName();
     }
 
     @Override
@@ -163,7 +167,7 @@ public class JpaPolicyAudit extends PfConcept implements PfAuthorative<PolicyAud
                         .append(pdpType, other.pdpType)
                         .append(action, other.action)
                         .append(timeStamp, other.timeStamp)
-                        .append(user, other.user)
+                        .append(userName, other.userName)
                         .toComparison();
         // @formatter:on
     }
@@ -180,7 +184,7 @@ public class JpaPolicyAudit extends PfConcept implements PfAuthorative<PolicyAud
                         .policy(policyIdent)
                         .action(action)
                         .timestamp(timeStamp == null ? null : timeStamp.toInstant())
-                        .user(user)
+                        .user(userName)
                         .build();
         // @formatter:on
     }
@@ -200,11 +204,10 @@ public class JpaPolicyAudit extends PfConcept implements PfAuthorative<PolicyAud
         pdpType = authorativeConcept.getPdpType();
         action = authorativeConcept.getAction();
         timeStamp = authorativeConcept.getTimestamp() == null ? Date.from(Instant.now())
-                : Date.from(authorativeConcept.getTimestamp());
-        user = authorativeConcept.getUser();
+            : Date.from(authorativeConcept.getTimestamp());
+        userName = authorativeConcept.getUser();
     }
 
-
     @Override
     public List<PfKey> getKeys() {
         final List<PfKey> keyList = new ArrayList<>();
@@ -221,7 +224,7 @@ public class JpaPolicyAudit extends PfConcept implements PfAuthorative<PolicyAud
     public void clean() {
         pdpGroup = Assertions.validateStringParameter("pdpGroup", pdpGroup, PfReferenceKey.LOCAL_NAME_REGEXP);
         pdpType = Assertions.validateStringParameter("pdpType", pdpType, PfReferenceKey.LOCAL_NAME_REGEXP);
-        user = Assertions.validateStringParameter("user", user, PfReferenceKey.LOCAL_NAME_REGEXP);
+        userName = Assertions.validateStringParameter("user", userName, PfReferenceKey.LOCAL_NAME_REGEXP);
     }
 
     @Override