You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ja...@apache.org on 2020/09/29 16:03:31 UTC
[geode] 09/18: Change DiskDir size to be Integer
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 267e1a8cd0fe7b5b7c47d0a8a006fabff8b78837
Author: Joris Melchior <jo...@gmail.com>
AuthorDate: Wed Jun 24 21:10:36 2020 -0400
Change DiskDir size to be Integer
- spottless apply
(cherry picked from commit 99d21ea77d880372c3fb22c1b974a9b503731595)
---
.../apache/geode/management/JQFilterVerificationDUnitTest.java | 3 ++-
.../internal/configuration/converters/DiskStoreConverter.java | 8 ++++++--
.../internal/configuration/realizers/DiskStoreRealizer.java | 8 +++-----
.../internal/configuration/validators/DiskStoreValidator.java | 6 +++---
.../internal/configuration/converters/DiskStoreConverterTest.java | 2 +-
.../internal/configuration/validators/DiskStoreValidatorTest.java | 4 ++--
.../java/org/apache/geode/management/configuration/DiskDir.java | 8 ++++----
7 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/JQFilterVerificationDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/JQFilterVerificationDUnitTest.java
index e57fd1a..4a2b1c4 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/JQFilterVerificationDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/JQFilterVerificationDUnitTest.java
@@ -206,7 +206,8 @@ public class JQFilterVerificationDUnitTest {
public void getDiskStore() throws Exception {
String uri = "/v1/diskstores/diskstore1";
JqResponse response =
- getJqResponse(uri, apiWithJQFilters.remove("/v1/diskstores/{id}").get("jqFilter").textValue());
+ getJqResponse(uri,
+ apiWithJQFilters.remove("/v1/diskstores/{id}").get("jqFilter").textValue());
response.getErrors().forEach(System.out::println);
Assertions.assertThat(response.hasErrors()).isFalse();
System.out.println("JQ output: " + response.getOutput());
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/converters/DiskStoreConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/converters/DiskStoreConverter.java
index d32f33a..e711681 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/converters/DiskStoreConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/converters/DiskStoreConverter.java
@@ -68,7 +68,9 @@ public class DiskStoreConverter extends ConfigurationConverter<DiskStore, DiskSt
diskStore.setDirectories(xmlObject.getDiskDirs().stream().map(diskDirType -> {
DiskDir diskDir = new DiskDir();
- diskDir.setDirSize(diskDirType.getDirSize());
+ if (diskDirType.getDirSize() != null) {
+ diskDir.setDirSize(Integer.parseInt(diskDirType.getDirSize()));
+ }
diskDir.setName(diskDirType.getContent());
return diskDir;
}).collect(Collectors.toList()));
@@ -113,7 +115,9 @@ public class DiskStoreConverter extends ConfigurationConverter<DiskStore, DiskSt
diskStoreType.setDiskDirs(configObject.getDirectories().stream().map(diskDir -> {
DiskDirType diskDirType = new DiskDirType();
diskDirType.setContent(diskDir.getName());
- diskDirType.setDirSize(diskDir.getDirSize());
+ if (diskDir.getDirSize() != null) {
+ diskDirType.setDirSize(diskDir.getDirSize().toString());
+ }
return diskDirType;
}).collect(Collectors.toList()));
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/realizers/DiskStoreRealizer.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/realizers/DiskStoreRealizer.java
index cdc397a..7dec835 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/realizers/DiskStoreRealizer.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/realizers/DiskStoreRealizer.java
@@ -23,8 +23,6 @@ import java.io.File;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.commons.lang3.StringUtils;
-
import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.internal.cache.DiskStoreAttributes;
import org.apache.geode.internal.cache.InternalCache;
@@ -70,10 +68,10 @@ public class DiskStoreRealizer implements ConfigurationRealizer<DiskStore, DiskS
.collect(Collectors.toList());
diskStoreAttributes.diskDirs = fileList.toArray(diskStoreAttributes.diskDirs);
diskStoreAttributes.diskDirSizes = config.getDirectories().stream().mapToInt(diskDir -> {
- if (StringUtils.isEmpty(diskDir.getDirSize())) {
- return Integer.MAX_VALUE;
+ if (diskDir.getDirSize() != null) {
+ return diskDir.getDirSize();
} else {
- return Integer.parseInt(diskDir.getDirSize());
+ return Integer.MAX_VALUE;
}
}).toArray();
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/validators/DiskStoreValidator.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/validators/DiskStoreValidator.java
index 448cad4..8f9bee1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/validators/DiskStoreValidator.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/validators/DiskStoreValidator.java
@@ -76,10 +76,10 @@ public class DiskStoreValidator implements ConfigurationValidator<DiskStore> {
checkWriteBufferSize(config.getWriteBufferSize());
}
verifyNonNegativeDirSize(config.getDirectories().stream().mapToInt(diskDir -> {
- if (StringUtils.isEmpty(diskDir.getDirSize())) {
- return Integer.MAX_VALUE;
+ if (diskDir.getDirSize() != null) {
+ return diskDir.getDirSize();
} else {
- return Integer.parseInt(diskDir.getDirSize());
+ return Integer.MAX_VALUE;
}
}).toArray());
}
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/converters/DiskStoreConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/converters/DiskStoreConverterTest.java
index 44d5eec..37d5113 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/converters/DiskStoreConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/converters/DiskStoreConverterTest.java
@@ -44,7 +44,7 @@ public class DiskStoreConverterTest {
config.setWriteBufferSize(1);
ArrayList<DiskDir> directories = new ArrayList<>();
- directories.add(new DiskDir("directoryName", "1"));
+ directories.add(new DiskDir("directoryName", 1));
config.setDirectories(directories);
DiskStoreType diskStoreType = diskStoreConverter.fromNonNullConfigObject(config);
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/validators/DiskStoreValidatorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/validators/DiskStoreValidatorTest.java
index 9064708..dd4f0c1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/validators/DiskStoreValidatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/validators/DiskStoreValidatorTest.java
@@ -44,7 +44,7 @@ public class DiskStoreValidatorTest {
String dirName = "diskdir";
diskDir.setName(dirName);
int dirSizeInteger = 1024;
- diskDir.setDirSize(Integer.toString(dirSizeInteger));
+ diskDir.setDirSize(dirSizeInteger);
diskStore.setDirectories(Collections.singletonList(diskDir));
}
@@ -158,7 +158,7 @@ public class DiskStoreValidatorTest {
public void dirSizesMustBePositiveNumber() {
diskStoreValidator.validate(CacheElementOperation.CREATE, diskStore);
- diskDir.setDirSize("-1");
+ diskDir.setDirSize(-1);
diskStore.setDirectories(Collections.singletonList(diskDir));
assertThatThrownBy(() -> diskStoreValidator.validate(CacheElementOperation.CREATE, diskStore))
.isInstanceOf(IllegalArgumentException.class)
diff --git a/geode-management/src/main/java/org/apache/geode/management/configuration/DiskDir.java b/geode-management/src/main/java/org/apache/geode/management/configuration/DiskDir.java
index 0c125bb..cb7367d 100644
--- a/geode-management/src/main/java/org/apache/geode/management/configuration/DiskDir.java
+++ b/geode-management/src/main/java/org/apache/geode/management/configuration/DiskDir.java
@@ -25,13 +25,13 @@ import org.apache.geode.management.api.JsonSerializable;
public class DiskDir implements Serializable, JsonSerializable {
private String name;
- private String dirSize;
+ private Integer dirSize;
public DiskDir() {
}
- public DiskDir(String name, String dirSize) {
+ public DiskDir(String name, Integer dirSize) {
this.name = name;
this.dirSize = dirSize;
}
@@ -44,11 +44,11 @@ public class DiskDir implements Serializable, JsonSerializable {
this.name = name;
}
- public String getDirSize() {
+ public Integer getDirSize() {
return dirSize;
}
- public void setDirSize(String dirSize) {
+ public void setDirSize(Integer dirSize) {
this.dirSize = dirSize;
}
}