Remove Id field from DiskStore

- Rebase against develop
marcoman · Jun 25, 2020 · 97ba5d0 · 97ba5d0
1 parent 9834ffa
commit 97ba5d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 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
@@ -31,8 +31,6 @@
 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 void setAutoCompact(Boolean autoCompact) {
     this.autoCompact = autoCompact;
   }
 
-
   public String getName() {
     return name;
   }
@@ -70,6 +67,7 @@ public void setDirectories(List<DiskDir> directories) {
     this.directories = directories;
   }
 
+  @JsonIgnore
   @Override
   public String getId() {
     return name;

diff --git a/...rc/main/resources/org/apache/geode/internal/sanctioned-geode-management-serializables.txt b/...rc/main/resources/org/apache/geode/internal/sanctioned-geode-management-serializables.txt
@@ -8,7 +8,7 @@ org/apache/geode/management/configuration/AutoSerializer,true,1,patterns:java/ut
 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/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,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/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