This is an automated email from the ASF dual-hosted git repository.
jasonhuynh pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
commit e916fa29c86480f9bcf054b4c3d975d695386906
Author: Joris Melchior <joris.melch...@gmail.com>
AuthorDate: Thu Jun 25 16:16:15 2020 -0400
Remove Id field from DiskStore
- Rebase against develop
---
.../java/org/apache/geode/management/configuration/DiskStore.java | 4 +---
.../geode/internal/sanctioned-geode-management-serializables.txt | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git
a/geode-management/src/main/java/org/apache/geode/management/configuration/DiskStore.java
b/geode-management/src/main/java/org/apache/geode/management/configuration/DiskStore.java
index cc9ff04..4bc3e20 100644
---
a/geode-management/src/main/java/org/apache/geode/management/configuration/DiskStore.java
+++
b/geode-management/src/main/java/org/apache/geode/management/configuration/DiskStore.java
@@ -31,8 +31,6 @@ import org.apache.geode.management.runtime.DiskStoreInfo;
public class DiskStore extends GroupableConfiguration<DiskStoreInfo> {
public static final String DISK_STORE_CONFIG_ENDPOINT = "/diskstores";
- @JsonIgnore
- private String id;
private String name;
private Integer compactionThreshold;
private Float diskUsageCriticalPercentage;
@@ -53,7 +51,6 @@ public class DiskStore extends
GroupableConfiguration<DiskStoreInfo> {
this.autoCompact = autoCompact;
}
-
public String getName() {
return name;
}
@@ -70,6 +67,7 @@ public class DiskStore extends
GroupableConfiguration<DiskStoreInfo> {
this.directories = directories;
}
+ @JsonIgnore
@Override
public String getId() {
return name;
diff --git
a/geode-management/src/main/resources/org/apache/geode/internal/sanctioned-geode-management-serializables.txt
b/geode-management/src/main/resources/org/apache/geode/internal/sanctioned-geode-management-serializables.txt
index 9293e03..37157f0 100644
---
a/geode-management/src/main/resources/org/apache/geode/internal/sanctioned-geode-management-serializables.txt
+++
b/geode-management/src/main/resources/org/apache/geode/internal/sanctioned-geode-management-serializables.txt
@@ -7,8 +7,8 @@
org/apache/geode/management/configuration/AbstractConfiguration,true,-6612840641
org/apache/geode/management/configuration/AutoSerializer,true,1,patterns:java/util/List,portable:java/lang/Boolean
org/apache/geode/management/configuration/ClassName,true,1,className:java/lang/String,initProperties:java/util/Properties
org/apache/geode/management/configuration/Deployment,true,6992732279452865384,deployedBy:java/lang/String,deployedTime:java/lang/String,jarFileName:java/lang/String
-org/apache/geode/management/configuration/DiskDir,false,dirSize:java/lang/String,name:java/lang/String
-org/apache/geode/management/configuration/DiskStore,false,allowForceCompaction:java/lang/Boolean,autoCompact:java/lang/Boolean,compactionThreshold:java/lang/Integer,directories:java/util/List,diskUsageCriticalPercentage:java/lang/Float,diskUsageWarningPercentage:java/lang/Float,id:java/lang/String,maxOplogSizeInBytes:java/lang/Long,name:java/lang/String,queueSize:java/lang/Integer,timeInterval:java/lang/Long,writeBufferSize:java/lang/Integer
+org/apache/geode/management/configuration/DiskDir,false,dirSize:java/lang/Integer,name:java/lang/String
+org/apache/geode/management/configuration/DiskStore,false,allowForceCompaction:java/lang/Boolean,autoCompact:java/lang/Boolean,compactionThreshold:java/lang/Integer,directories:java/util/List,diskUsageCriticalPercentage:java/lang/Float,diskUsageWarningPercentage:java/lang/Float,maxOplogSizeInBytes:java/lang/Long,name:java/lang/String,queueSize:java/lang/Integer,timeInterval:java/lang/Long,writeBufferSize:java/lang/Integer
org/apache/geode/management/configuration/GatewayReceiver,false,endPort:java/lang/Integer,gatewayTransportFilters:java/util/List,manualStart:java/lang/Boolean,maximumTimeBetweenPings:java/lang/Integer,socketBufferSize:java/lang/Integer,startPort:java/lang/Integer
org/apache/geode/management/configuration/GroupableConfiguration,false,group:java/lang/String
org/apache/geode/management/configuration/Index,false,expression:java/lang/String,indexType:org/apache/geode/management/configuration/IndexType,name:java/lang/String,regionPath:java/lang/String
