You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2021/11/19 19:44:21 UTC
[geode] 01/16: MacOSX to macOS
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch wip/oshi-multios-stats-module
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 0a485c43b1ea3a260fb4f0dfa75bc0229caf52b7
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Thu Jun 10 16:29:19 2021 -0700
MacOSX to macOS
---
.../src/main/java/org/apache/geode/internal/lang/SystemUtils.java | 6 +++---
.../java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java | 8 ++++----
.../test/java/org/apache/geode/internal/util/HostNameTest.java | 8 ++++----
.../geode/management/internal/cli/functions/NetstatFunction.java | 4 ++--
.../org/apache/geode/management/internal/cli/util/JdkTool.java | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java b/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
index 53f8660..64e079b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
@@ -44,7 +44,7 @@ public class SystemUtils {
// Operating System Names
public static final String LINUX_OS_NAME = "Linux";
- public static final String MAC_OSX_NAME = "Mac";
+ public static final String MAC_OS_NAME = "Mac";
public static final String WINDOWS_OS_NAME = "Windows";
public static final String SOLARIS_OS_NAME = "SunOS";
@@ -152,8 +152,8 @@ public class SystemUtils {
* OSX.
* @see #isOS(String)
*/
- public static boolean isMacOSX() {
- return isOS(MAC_OSX_NAME);
+ public static boolean isMacOS() {
+ return isOS(MAC_OS_NAME);
}
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
index 5676252..0f5b8eb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
@@ -18,7 +18,7 @@ import static org.apache.geode.internal.lang.SystemUtils.APPLE_JVM_VENDOR_NAME;
import static org.apache.geode.internal.lang.SystemUtils.IBM_J9_JVM_NAME;
import static org.apache.geode.internal.lang.SystemUtils.JAVA_HOTSPOT_JVM_NAME;
import static org.apache.geode.internal.lang.SystemUtils.LINUX_OS_NAME;
-import static org.apache.geode.internal.lang.SystemUtils.MAC_OSX_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.MAC_OS_NAME;
import static org.apache.geode.internal.lang.SystemUtils.ORACLE_JROCKIT_JVM_NAME;
import static org.apache.geode.internal.lang.SystemUtils.ORACLE_JVM_VENDOR_NAME;
import static org.apache.geode.internal.lang.SystemUtils.WINDOWS_OS_NAME;
@@ -32,7 +32,7 @@ import static org.apache.geode.internal.lang.SystemUtils.isHotSpotVM;
import static org.apache.geode.internal.lang.SystemUtils.isJ9VM;
import static org.apache.geode.internal.lang.SystemUtils.isJRockitVM;
import static org.apache.geode.internal.lang.SystemUtils.isLinux;
-import static org.apache.geode.internal.lang.SystemUtils.isMacOSX;
+import static org.apache.geode.internal.lang.SystemUtils.isMacOS;
import static org.apache.geode.internal.lang.SystemUtils.isOracleJVM;
import static org.apache.geode.internal.lang.SystemUtils.isWindows;
import static org.assertj.core.api.Assertions.assertThat;
@@ -99,8 +99,8 @@ public class SystemUtilsJUnitTest {
@Test
public void testIsMacOSX() {
final boolean expected =
- ManagementFactory.getOperatingSystemMXBean().getName().contains(MAC_OSX_NAME);
- assertEquals(expected, isMacOSX());
+ ManagementFactory.getOperatingSystemMXBean().getName().contains(MAC_OS_NAME);
+ assertEquals(expected, isMacOS());
}
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
index fa502db..fd0450c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.util;
import static org.apache.geode.internal.lang.SystemUtils.LINUX_OS_NAME;
-import static org.apache.geode.internal.lang.SystemUtils.MAC_OSX_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.MAC_OS_NAME;
import static org.apache.geode.internal.lang.SystemUtils.SOLARIS_OS_NAME;
import static org.apache.geode.internal.lang.SystemUtils.WINDOWS_OS_NAME;
import static org.apache.geode.internal.lang.SystemUtils.isWindows;
@@ -54,7 +54,7 @@ public class HostNameTest {
}
@Test
- @Parameters({MAC_OSX_NAME, LINUX_OS_NAME, SOLARIS_OS_NAME, WINDOWS_OS_NAME})
+ @Parameters({MAC_OS_NAME, LINUX_OS_NAME, SOLARIS_OS_NAME, WINDOWS_OS_NAME})
public void shouldExecHostNameIfEnvValueNotAvailableOnOS(String osName) throws IOException {
setHostNamePropertiesNull(osName);
String result = new HostName().determineHostName();
@@ -62,7 +62,7 @@ public class HostNameTest {
}
@Test
- @Parameters({MAC_OSX_NAME, LINUX_OS_NAME, SOLARIS_OS_NAME, WINDOWS_OS_NAME})
+ @Parameters({MAC_OS_NAME, LINUX_OS_NAME, SOLARIS_OS_NAME, WINDOWS_OS_NAME})
public void shouldUseComputerNameIfAvailableOnOS(String osName) throws IOException {
setHostNameProperties(osName);
String result = new HostName().determineHostName();
@@ -70,7 +70,7 @@ public class HostNameTest {
}
@Test
- @Parameters({MAC_OSX_NAME, LINUX_OS_NAME, SOLARIS_OS_NAME, WINDOWS_OS_NAME})
+ @Parameters({MAC_OS_NAME, LINUX_OS_NAME, SOLARIS_OS_NAME, WINDOWS_OS_NAME})
public void shouldBeNullIfEnvValueNotAvailableOnOS(String osName) throws IOException {
setHostNamePropertiesNull(osName);
String result = new HostName().getHostNameFromEnv();
diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/NetstatFunction.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/NetstatFunction.java
index 7375c0b..e9f3a02 100644
--- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/NetstatFunction.java
+++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/NetstatFunction.java
@@ -18,7 +18,7 @@ import static org.apache.geode.internal.lang.SystemUtils.getOsArchitecture;
import static org.apache.geode.internal.lang.SystemUtils.getOsName;
import static org.apache.geode.internal.lang.SystemUtils.getOsVersion;
import static org.apache.geode.internal.lang.SystemUtils.isLinux;
-import static org.apache.geode.internal.lang.SystemUtils.isMacOSX;
+import static org.apache.geode.internal.lang.SystemUtils.isMacOS;
import static org.apache.geode.internal.lang.SystemUtils.isSolaris;
import java.io.BufferedReader;
@@ -163,7 +163,7 @@ public class NetstatFunction implements InternalFunction<NetstatFunction.Netstat
existingNetstatInfo.append("################ ").append(LSOF_COMMAND)
.append(" output ###################").append(lineSeparator);
- if (isLinux() || isMacOSX() || isSolaris()) {
+ if (isLinux() || isMacOS() || isSolaris()) {
List<String> cmdOptionsList = new ArrayList<>();
cmdOptionsList.add(LSOF_COMMAND);
cmdOptionsList.add("-n");
diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/util/JdkTool.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/util/JdkTool.java
index e0ebd9b..99e79a1 100644
--- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/util/JdkTool.java
+++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/util/JdkTool.java
@@ -31,7 +31,7 @@ public class JdkTool {
protected static final String JAVA_HOME = System.getProperty("java.home");
public static String getJVisualVMPathname() {
- if (SystemUtils.isMacOSX()) {
+ if (SystemUtils.isMacOS()) {
try {
return IOUtils.verifyPathnameExists(
"/System/Library/Java/Support/VisualVM.bundle/Contents/Home/bin/jvisualvm");