From 68ef69ebd258c7d0423a2cc49fac847284aeab4c Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 11 Jan 2020 02:49:02 -0500 Subject: [PATCH] use time_duration for timeout fields --- .../src/main/java/bubble/model/account/AccountPolicy.java | 4 ++-- utils/cobbzilla-wizard | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bubble-server/src/main/java/bubble/model/account/AccountPolicy.java b/bubble-server/src/main/java/bubble/model/account/AccountPolicy.java index 9d785437..634a5054 100644 --- a/bubble-server/src/main/java/bubble/model/account/AccountPolicy.java +++ b/bubble-server/src/main/java/bubble/model/account/AccountPolicy.java @@ -56,11 +56,11 @@ public class AccountPolicy extends IdentifiableBase implements HasAccount { @JsonIgnore @Override public String getName() { return getAccount(); } - @ECSearchable(type=EntityFieldType.expiration_time) @ECField(index=20) + @ECSearchable(type=EntityFieldType.time_duration) @ECField(index=20) @Type(type=ENCRYPTED_LONG) @Column(columnDefinition="varchar("+ENC_LONG+") NOT NULL") @Getter @Setter private Long nodeOperationTimeout = MINUTES.toMillis(30); - @ECSearchable(type=EntityFieldType.expiration_time) @ECField(index=30) + @ECSearchable(type=EntityFieldType.time_duration) @ECField(index=30) @Type(type=ENCRYPTED_LONG) @Column(columnDefinition="varchar("+ENC_LONG+") NOT NULL") @Getter @Setter private Long accountOperationTimeout = MINUTES.toMillis(10); diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard index 33c38a7d..b7854221 160000 --- a/utils/cobbzilla-wizard +++ b/utils/cobbzilla-wizard @@ -1 +1 @@ -Subproject commit 33c38a7d30e6c9c9aeeb5d45d2db2a681a1d903e +Subproject commit b785422119b1bd70dfadb32d9f5ed20970935365