This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push: new 8b0b0ba3f4 fix build-time jpa enhancer warnings 8b0b0ba3f4 is described below commit 8b0b0ba3f4de891f3496c22b3cf85ec5dc5a480e Author: yasithdev <yasit...@icloud.com> AuthorDate: Tue Jul 15 01:55:27 2025 -0500 fix build-time jpa enhancer warnings --- .../entities/workflowcatalog/WorkflowEntity.java | 6 +-- .../commons/tenant/entities/GatewayEntity.java | 42 ++++++++-------- .../user/entities/CustomizedDashboardEntity.java | 50 +++++++++---------- .../user/entities/NSFDemographicsEntity.java | 10 ++-- .../commons/user/entities/UserProfileEntity.java | 56 +++++++++++----------- .../sharing/registry/db/entities/EntityEntity.java | 6 +-- .../sharing/registry/db/entities/UserEntity.java | 6 +-- 7 files changed, 89 insertions(+), 87 deletions(-) diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java b/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java index b07a718bf6..a367828aa1 100644 --- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java @@ -50,7 +50,7 @@ public class WorkflowEntity implements Serializable { private String graph; @Column(name = "IMAGE") - private ByteBuffer image; + private byte[] image; @Column(name = "UPDATE_TIME") private Timestamp updateTime; @@ -124,12 +124,12 @@ public class WorkflowEntity implements Serializable { this.graph = graph; } - public ByteBuffer getImage() { + public byte[] getImage() { return this.image; } - public void setImage(ByteBuffer image) { + public void setImage(byte[] image) { this.image = image; } diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java index 9ef0d53bcf..23bb59950d 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java @@ -237,7 +237,7 @@ public class GatewayEntity { @PrePersist void createdAt() { - this.requestCreationTime = System.currentTimeMillis(); + this.setRequestCreationTime(System.currentTimeMillis()); } @Override @@ -258,25 +258,25 @@ public class GatewayEntity { @Override public String toString() { return "GatewayEntity{" + "airavataInternalGatewayId='" - + airavataInternalGatewayId + '\'' + ", gatewayId='" - + gatewayId + '\'' + ", gatewayName='" - + gatewayName + '\'' + ", domain='" - + domain + '\'' + ", emailAddress='" - + emailAddress + '\'' + ", gatewayApprovalStatus='" - + gatewayApprovalStatus + '\'' + ", gatewayAcronym='" - + gatewayAcronym + '\'' + ", gatewayUrl='" - + gatewayUrl + '\'' + ", gatewayPublicAbstract='" - + gatewayPublicAbstract + '\'' + ", reviewProposalDescription='" - + reviewProposalDescription + '\'' + ", gatewayAdminFirstName='" - + gatewayAdminFirstName + '\'' + ", gatewayAdminLastName='" - + gatewayAdminLastName + '\'' + ", gatewayAdminEmail='" - + gatewayAdminEmail + '\'' + ", identityServerUserName='" - + identityServerUserName + '\'' + ", identityServerPasswordToken='" - + identityServerPasswordToken + '\'' + ", declinedReason='" - + declinedReason + '\'' + ", oauthClientId='" - + oauthClientId + '\'' + ", oauthClientSecret='" - + oauthClientSecret + '\'' + ", requestCreationTime=" - + requestCreationTime + ", requesterUsername='" - + requesterUsername + '\'' + '}'; + + getAiravataInternalGatewayId() + '\'' + ", gatewayId='" + + getGatewayId() + '\'' + ", gatewayName='" + + getGatewayName() + '\'' + ", domain='" + + getDomain() + '\'' + ", emailAddress='" + + getEmailAddress() + '\'' + ", gatewayApprovalStatus='" + + getGatewayApprovalStatus() + '\'' + ", gatewayAcronym='" + + getGatewayAcronym() + '\'' + ", gatewayUrl='" + + getGatewayUrl() + '\'' + ", gatewayPublicAbstract='" + + getGatewayPublicAbstract() + '\'' + ", reviewProposalDescription='" + + getReviewProposalDescription() + '\'' + ", gatewayAdminFirstName='" + + getGatewayAdminFirstName() + '\'' + ", gatewayAdminLastName='" + + getGatewayAdminLastName() + '\'' + ", gatewayAdminEmail='" + + getGatewayAdminEmail() + '\'' + ", identityServerUserName='" + + getIdentityServerUserName() + '\'' + ", identityServerPasswordToken='" + + getIdentityServerPasswordToken() + '\'' + ", declinedReason='" + + getDeclinedReason() + '\'' + ", oauthClientId='" + + getOauthClientId() + '\'' + ", oauthClientSecret='" + + getOauthClientSecret() + '\'' + ", requestCreationTime=" + + getRequestCreationTime() + ", requesterUsername='" + + getRequesterUsername() + '\'' + '}'; } } diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java index 75b3eef443..1534279537 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java @@ -292,30 +292,30 @@ public class CustomizedDashboardEntity { @Override public String toString() { return "CustomizedDashboardEntity{" + "airavataInternalUserId='" - + airavataInternalUserId + '\'' + ", experimentId='" - + experimentId + '\'' + ", name='" - + name + '\'' + ", description='" - + description + '\'' + ", project='" - + project + '\'' + ", owner='" - + owner + '\'' + ", application='" - + application + '\'' + ", computeResource='" - + computeResource + '\'' + ", jobName='" - + jobName + '\'' + ", jobId='" - + jobId + '\'' + ", jobStatus='" - + jobStatus + '\'' + ", jobCreationTime='" - + jobCreationTime + '\'' + ", notificationsTo='" - + notificationsTo + '\'' + ", workingDir='" - + workingDir + '\'' + ", jobDescription='" - + jobDescription + '\'' + ", creationTime='" - + creationTime + '\'' + ", lastModifiedTime='" - + lastModifiedTime + '\'' + ", wallTime='" - + wallTime + '\'' + ", cpuCount='" - + cpuCount + '\'' + ", nodeCount='" - + nodeCount + '\'' + ", queue='" - + queue + '\'' + ", inputs='" - + inputs + '\'' + ", outputs='" - + outputs + '\'' + ", storageDir='" - + storageDir + '\'' + ", errors='" - + errors + '\'' + '}'; + + getAiravataInternalUserId() + '\'' + ", experimentId='" + + getExperimentId() + '\'' + ", name='" + + getName() + '\'' + ", description='" + + getDescription() + '\'' + ", project='" + + getProject() + '\'' + ", owner='" + + getOwner() + '\'' + ", application='" + + getApplication() + '\'' + ", computeResource='" + + getComputeResource() + '\'' + ", jobName='" + + getJobName() + '\'' + ", jobId='" + + getJobId() + '\'' + ", jobStatus='" + + getJobStatus() + '\'' + ", jobCreationTime='" + + getJobCreationTime() + '\'' + ", notificationsTo='" + + getNotificationsTo() + '\'' + ", workingDir='" + + getWorkingDir() + '\'' + ", jobDescription='" + + getJobDescription() + '\'' + ", creationTime='" + + getCreationTime() + '\'' + ", lastModifiedTime='" + + getLastModifiedTime() + '\'' + ", wallTime='" + + getWallTime() + '\'' + ", cpuCount='" + + getCpuCount() + '\'' + ", nodeCount='" + + getNodeCount() + '\'' + ", queue='" + + getQueue() + '\'' + ", inputs='" + + getInputs() + '\'' + ", outputs='" + + getOutputs() + '\'' + ", storageDir='" + + getStorageDir() + '\'' + ", errors='" + + getErrors() + '\'' + '}'; } } diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java index 0119ced30f..e79559ec5a 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java @@ -97,10 +97,10 @@ public class NSFDemographicsEntity { @Override public String toString() { return "NSFDemographicsEntity{" + "airavataInternalUserId='" - + airavataInternalUserId + '\'' + ", gender='" - + gender + '\'' + ", ethnicities=" - + ethnicities + ", races=" - + races + ", disabilities=" - + disabilities + '}'; + + getAiravataInternalUserId() + '\'' + ", gender='" + + getGender() + '\'' + ", ethnicities=" + + getEthnicities() + ", races=" + + getRaces() + ", disabilities=" + + getDisabilities() + '}'; } } diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java index 8e34b9553c..ae4f8a364b 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java @@ -309,41 +309,43 @@ public class UserProfileEntity { @PrePersist void createdAt() { - this.creationTime = this.lastAccessTime = new Date(); + var date = new Date(); + this.setCreationTime(date); + this.setLastAccessTime(date); } @PreUpdate void updatedAt() { - this.lastAccessTime = new Date(); + this.setLastAccessTime(new Date()); } @Override public String toString() { return "UserProfileEntity{" + "airavataInternalUserId='" - + airavataInternalUserId + '\'' + ", userId='" - + userId + '\'' + ", gatewayId='" - + gatewayId + '\'' + ", userModelVersion='" - + userModelVersion + '\'' + ", firstName='" - + firstName + '\'' + ", lastName='" - + lastName + '\'' + ", middleName='" - + middleName + '\'' + ", namePrefix='" - + namePrefix + '\'' + ", nameSuffix='" - + nameSuffix + '\'' + ", orcidId='" - + orcidId + '\'' + ", country='" - + country + '\'' + ", homeOrganization='" - + homeOrganization + '\'' + ", orginationAffiliation='" - + orginationAffiliation + '\'' + ", creationTime=" - + creationTime + ", lastAccessTime=" - + lastAccessTime + ", validUntil=" - + validUntil + ", state='" - + state + '\'' + ", comments='" - + comments + '\'' + ", labeledURI=" - + labeledURI + ", gpgKey='" - + gpgKey + '\'' + ", timeZone='" - + timeZone + '\'' + ", nationality=" - + nationality + ", emails=" - + emails + ", phones=" - + phones + ", nsfDemographics=" - + nsfDemographics + '}'; + + getAiravataInternalUserId() + '\'' + ", userId='" + + getUserId() + '\'' + ", gatewayId='" + + getGatewayId() + '\'' + ", userModelVersion='" + + getUserModelVersion() + '\'' + ", firstName='" + + getFirstName() + '\'' + ", lastName='" + + getLastName() + '\'' + ", middleName='" + + getMiddleName() + '\'' + ", namePrefix='" + + getNamePrefix() + '\'' + ", nameSuffix='" + + getNameSuffix() + '\'' + ", orcidId='" + + getOrcidId() + '\'' + ", country='" + + getCountry() + '\'' + ", homeOrganization='" + + getHomeOrganization() + '\'' + ", orginationAffiliation='" + + getOrginationAffiliation() + '\'' + ", creationTime=" + + getCreationTime() + ", lastAccessTime=" + + getLastAccessTime() + ", validUntil=" + + getValidUntil() + ", state='" + + getState() + '\'' + ", comments='" + + getComments() + '\'' + ", labeledURI=" + + getLabeledURI() + ", gpgKey='" + + getGpgKey() + '\'' + ", timeZone='" + + getTimeZone() + '\'' + ", nationality=" + + getNationality() + ", emails=" + + getEmails() + ", phones=" + + getPhones() + ", nsfDemographics=" + + getNsfDemographics() + '}'; } } diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java b/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java index 31f26f2d2b..7e5c140245 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java @@ -36,7 +36,7 @@ public class EntityEntity { private String parentEntityId; private String name; private String description; - private ByteBuffer binaryData; + private byte[] binaryData; private String fullText; private Long originalEntityCreationTime; private Long sharedCount; @@ -115,11 +115,11 @@ public class EntityEntity { @Lob @Column(name = "BINARY_DATA") - public ByteBuffer getBinaryData() { + public byte[] getBinaryData() { return binaryData; } - public void setBinaryData(ByteBuffer binaryData) { + public void setBinaryData(byte[] binaryData) { this.binaryData = binaryData; } diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java b/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java index 9d442510b2..328fa61c5b 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java @@ -35,7 +35,7 @@ public class UserEntity { private String firstName; private String lastName; private String email; - private ByteBuffer icon; + private byte[] icon; private Long createdTime; private Long updatedTime; @@ -101,11 +101,11 @@ public class UserEntity { @Lob @Column(name = "ICON") - public ByteBuffer getIcon() { + public byte[] getIcon() { return icon; } - public void setIcon(ByteBuffer icon) { + public void setIcon(byte[] icon) { this.icon = icon; }