@@ -64,7 +64,7 @@ public class AccountPayment extends IdentifiableBase implements HasAccountNoName | |||||
@Type(type=ENCRYPTED_LONG) @Column(updatable=false, columnDefinition="varchar("+(ENC_LONG)+") NOT NULL") | @Type(type=ENCRYPTED_LONG) @Column(updatable=false, columnDefinition="varchar("+(ENC_LONG)+") NOT NULL") | ||||
@Getter @Setter private Long amount = 0L; | @Getter @Setter private Long amount = 0L; | ||||
@ECSearchable @ECField(index=90, type=EntityFieldType.opaque_string) | |||||
@ECSearchable @ECField(index=90) | |||||
@ECIndex @Column(nullable=false, updatable=false, length=10) | @ECIndex @Column(nullable=false, updatable=false, length=10) | ||||
@Getter @Setter private String currency; | @Getter @Setter private String currency; | ||||
@@ -72,11 +72,11 @@ public class AccountPayment extends IdentifiableBase implements HasAccountNoName | |||||
@Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(100000+ENC_PAD)+") NOT NULL") | @Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(100000+ENC_PAD)+") NOT NULL") | ||||
@Getter @Setter private String info; | @Getter @Setter private String info; | ||||
@ECSearchable @ECField(index=110, type=EntityFieldType.opaque_string) | |||||
@ECSearchable @ECField(index=110, type=EntityFieldType.error) | |||||
@Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(200+ENC_PAD)+")") | @Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(200+ENC_PAD)+")") | ||||
@Getter @Setter private String violation; | @Getter @Setter private String violation; | ||||
@ECSearchable @ECField(index=120, type=EntityFieldType.opaque_string) | |||||
@ECSearchable @ECField(index=120, type=EntityFieldType.error) | |||||
@Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(10000+ENC_PAD)+")") | @Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(10000+ENC_PAD)+")") | ||||
@JsonIgnore @Getter @Setter private String exception; | @JsonIgnore @Getter @Setter private String exception; | ||||
@@ -120,7 +120,7 @@ public class AccountPlan extends IdentifiableBase implements HasAccount { | |||||
@ECSearchable @ECField(index=140) @Column(nullable=false) | @ECSearchable @ECField(index=140) @Column(nullable=false) | ||||
@Getter @Setter private Boolean refundIssued = false; | @Getter @Setter private Boolean refundIssued = false; | ||||
@ECSearchable @ECField(index=150, type=EntityFieldType.opaque_string) | |||||
@ECSearchable @ECField(index=150, type=EntityFieldType.error) | |||||
@Getter @Setter private String refundError; | @Getter @Setter private String refundError; | ||||
// Fields below are used when creating a new plan, to also create the network associated with it | // Fields below are used when creating a new plan, to also create the network associated with it | ||||
@@ -74,7 +74,7 @@ public class Bill extends IdentifiableBase implements HasAccountNoName { | |||||
@Type(type=ENCRYPTED_LONG) @Column(updatable=false, columnDefinition="varchar("+(ENC_LONG)+") NOT NULL") | @Type(type=ENCRYPTED_LONG) @Column(updatable=false, columnDefinition="varchar("+(ENC_LONG)+") NOT NULL") | ||||
@Getter @Setter private Long price = 0L; | @Getter @Setter private Long price = 0L; | ||||
@ECSearchable @ECField(index=110, type=EntityFieldType.opaque_string) | |||||
@ECSearchable @ECField(index=110) | |||||
@ECIndex @Column(nullable=false, updatable=false, length=10) | @ECIndex @Column(nullable=false, updatable=false, length=10) | ||||
@Getter @Setter private String currency; | @Getter @Setter private String currency; | ||||
@@ -86,7 +86,7 @@ public class BubblePlan extends IdentifiableBase implements HasAccount, HasPrior | |||||
@ECIndex @Column(nullable=false) | @ECIndex @Column(nullable=false) | ||||
@Getter @Setter private Long price; | @Getter @Setter private Long price; | ||||
@ECSearchable @ECField(index=70, type=EntityFieldType.opaque_string) | |||||
@ECSearchable @ECField(index=70) | |||||
@ECIndex @Column(nullable=false, length=10) | @ECIndex @Column(nullable=false, length=10) | ||||
@Getter @Setter private String currency = "USD"; | @Getter @Setter private String currency = "USD"; | ||||
@@ -64,7 +64,7 @@ public class BubbleBackup extends IdentifiableBase implements HasAccount { | |||||
@Getter @Setter private BackupStatus status; | @Getter @Setter private BackupStatus status; | ||||
public boolean success () { return status == BackupStatus.backup_completed; } | public boolean success () { return status == BackupStatus.backup_completed; } | ||||
@ECSearchable(filter=true) @ECField(index=60, type=EntityFieldType.opaque_string) | |||||
@ECSearchable(filter=true) @ECField(index=60) | |||||
@Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(ERROR_MAXLEN+ENC_PAD)+")") | @Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(ERROR_MAXLEN+ENC_PAD)+")") | ||||
@Getter private String error; | @Getter private String error; | ||||
public BubbleBackup setError (String err) { this.error = ellipsis(err, ERROR_MAXLEN); return this; } | public BubbleBackup setError (String err) { this.error = ellipsis(err, ERROR_MAXLEN); return this; } | ||||
@@ -93,7 +93,7 @@ public class BubbleNetwork extends IdentifiableBase implements HasNetwork, HasBu | |||||
@Column(nullable=false, updatable=false, length=UUID_MAXLEN) | @Column(nullable=false, updatable=false, length=UUID_MAXLEN) | ||||
@Getter @Setter private String domain; | @Getter @Setter private String domain; | ||||
@ECSearchable(filter=true) @ECField(index=40, type=EntityFieldType.opaque_string) | |||||
@ECSearchable(filter=true) @ECField(index=40, type=EntityFieldType.fqdn) | |||||
@ECIndex @Column(nullable=false, updatable=false, length=DOMAIN_NAME_MAXLEN) | @ECIndex @Column(nullable=false, updatable=false, length=DOMAIN_NAME_MAXLEN) | ||||
@Getter @Setter private String domainName; // denormalized from BubbleDomain | @Getter @Setter private String domainName; // denormalized from BubbleDomain | ||||
@@ -83,7 +83,7 @@ public class NotificationBase extends IdentifiableBase implements HasAccountNoNa | |||||
@Transient public NotificationReceipt getReceipt () { return receiptJson == null ? null : json(receiptJson, NotificationReceipt.class); } | @Transient public NotificationReceipt getReceipt () { return receiptJson == null ? null : json(receiptJson, NotificationReceipt.class); } | ||||
public <T extends NotificationBase> T setReceipt (NotificationReceipt receipt) { return (T) setReceiptJson(receipt == null ? null : json(receiptJson)); } | public <T extends NotificationBase> T setReceipt (NotificationReceipt receipt) { return (T) setReceiptJson(receipt == null ? null : json(receiptJson)); } | ||||
@ECSearchable(filter=true) @ECField(index=100, type=EntityFieldType.opaque_string) | |||||
@ECSearchable(filter=true) @ECField(index=100) | |||||
@Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(ERROR_MAXLEN+ENC_PAD)+")") | @Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(ERROR_MAXLEN+ENC_PAD)+")") | ||||
@JsonIgnore @Getter private String error; | @JsonIgnore @Getter private String error; | ||||
public NotificationBase setError (String err) { this.error = ellipsis(err, ERROR_MAXLEN); return this; } | public NotificationBase setError (String err) { this.error = ellipsis(err, ERROR_MAXLEN); return this; } | ||||
@@ -1 +1 @@ | |||||
Subproject commit 99a536b4085a56803d73b5f20a6da9f39db78f98 | |||||
Subproject commit 10e833a28dd0ebe1152a059576eeba48019440ef |