You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2021/06/20 20:13:30 UTC
[airavata-custos] branch develop updated: sdk_update
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
The following commit(s) were added to refs/heads/develop by this push:
new d0dd49b sdk_update
new 15eda48 Merge pull request #213 from isururanawaka/sdk_update
d0dd49b is described below
commit d0dd49bc2817597bd008441312a2f42145722ce7
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Sun Jun 20 16:12:33 2021 -0400
sdk_update
---
.../resource/secret/manager/adaptor/outbound/CredentialWriter.java | 1 +
.../src/main/java/org/apache/custos/sharing/mapper/EntityMapper.java | 1 +
.../main/java/org/apache/custos/sharing/persistance/model/Entity.java | 1 +
3 files changed, 3 insertions(+)
diff --git a/custos-core-services/resource-secret-core-service/src/main/java/org/apache/custos/resource/secret/manager/adaptor/outbound/CredentialWriter.java b/custos-core-services/resource-secret-core-service/src/main/java/org/apache/custos/resource/secret/manager/adaptor/outbound/CredentialWriter.java
index 3287a8a..e3bf76a 100644
--- a/custos-core-services/resource-secret-core-service/src/main/java/org/apache/custos/resource/secret/manager/adaptor/outbound/CredentialWriter.java
+++ b/custos-core-services/resource-secret-core-service/src/main/java/org/apache/custos/resource/secret/manager/adaptor/outbound/CredentialWriter.java
@@ -567,6 +567,7 @@ public class CredentialWriter {
secret.setTenantId(credential.getTenantId());
secret.setExternalId(credential.getExternalId());
secret.setType(credential.getType());
+ secret.setCreatedAt(exSecret.get().getCreatedAt());
repository.save(secret);
return true;
}
diff --git a/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/mapper/EntityMapper.java b/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/mapper/EntityMapper.java
index a43e539..77d41fc 100644
--- a/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/mapper/EntityMapper.java
+++ b/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/mapper/EntityMapper.java
@@ -68,6 +68,7 @@ public class EntityMapper {
perEntity.setExternalParentId(entity.getParentId());
}
+
if (entity.getOriginalCreationTime() > 0) {
perEntity.setOriginalCreatedTime(new Date(entity.getOriginalCreationTime()));
}
diff --git a/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/persistance/model/Entity.java b/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/persistance/model/Entity.java
index 6bad30f..7e91c4d 100644
--- a/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/persistance/model/Entity.java
+++ b/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/persistance/model/Entity.java
@@ -55,6 +55,7 @@ public class Entity {
private String description;
@Column
+ @Lob
private String fullText;
@Column