From 19f266d4075a8c56d56f6b8c7e95773378b95211 Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Sat, 22 Apr 2017 13:57:27 -0700
Subject: [PATCH] MINOR: Move `Os` class to utils package and rename it to
 OperatingSystem

The `common` package is public and this class is
internal.

Author: Ismael Juma <ismael@juma.me.uk>

Reviewers: Jason Gustafson <jason@confluent.io>

Closes #2759 from ijuma/move-os-to-utils
---
 .../common/{Os.java => utils/OperatingSystem.java} |  8 ++++++--
 .../org/apache/kafka/common/utils/ShellTest.java   |  5 ++---
 core/src/main/scala/kafka/log/AbstractIndex.scala  | 14 ++++++--------
 3 files changed, 14 insertions(+), 13 deletions(-)
 rename clients/src/main/java/org/apache/kafka/common/{Os.java => utils/OperatingSystem.java} (89%)

diff --git a/clients/src/main/java/org/apache/kafka/common/Os.java b/clients/src/main/java/org/apache/kafka/common/utils/OperatingSystem.java
similarity index 89%
rename from clients/src/main/java/org/apache/kafka/common/Os.java
rename to clients/src/main/java/org/apache/kafka/common/utils/OperatingSystem.java
index ba4151613e2..9d80295b123 100644
--- a/clients/src/main/java/org/apache/kafka/common/Os.java
+++ b/clients/src/main/java/org/apache/kafka/common/utils/OperatingSystem.java
@@ -14,11 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kafka.common;
+package org.apache.kafka.common.utils;
 
 import java.util.Locale;
 
-public final class Os {
+public final class OperatingSystem {
+
+    private OperatingSystem() {
+    }
+    
     public static final String NAME;
 
     public static final boolean IS_WINDOWS;
diff --git a/clients/src/test/java/org/apache/kafka/common/utils/ShellTest.java b/clients/src/test/java/org/apache/kafka/common/utils/ShellTest.java
index 72d05907fc4..923783e4c97 100644
--- a/clients/src/test/java/org/apache/kafka/common/utils/ShellTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/utils/ShellTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.kafka.common.utils;
 
-import org.apache.kafka.common.Os;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -30,14 +29,14 @@ public class ShellTest {
 
     @Test
     public void testEchoHello() throws Exception {
-        assumeTrue(!Os.IS_WINDOWS);
+        assumeTrue(!OperatingSystem.IS_WINDOWS);
         String output = Shell.execCommand("echo", "hello");
         assertEquals("hello\n", output);
     }
 
     @Test
     public void testHeadDevZero() throws Exception {
-        assumeTrue(!Os.IS_WINDOWS);
+        assumeTrue(!OperatingSystem.IS_WINDOWS);
         final int length = 100000;
         String output = Shell.execCommand("head", "-c", Integer.toString(length), "/dev/zero");
         assertEquals(length, output.length());
diff --git a/core/src/main/scala/kafka/log/AbstractIndex.scala b/core/src/main/scala/kafka/log/AbstractIndex.scala
index 53b2f74cfb0..bddd1b37f13 100644
--- a/core/src/main/scala/kafka/log/AbstractIndex.scala
+++ b/core/src/main/scala/kafka/log/AbstractIndex.scala
@@ -25,8 +25,7 @@ import java.util.concurrent.locks.{Lock, ReentrantLock}
 import kafka.log.IndexSearchType.IndexSearchEntity
 import kafka.utils.CoreUtils.inLock
 import kafka.utils.{CoreUtils, Logging}
-import org.apache.kafka.common.Os
-import org.apache.kafka.common.utils.Utils
+import org.apache.kafka.common.utils.{OperatingSystem, Utils}
 import sun.nio.ch.DirectBuffer
 
 import scala.math.ceil
@@ -105,7 +104,7 @@ abstract class AbstractIndex[K, V](@volatile var file: File, val baseOffset: Lon
       val position = mmap.position
 
       /* Windows won't let us modify the file length while the file is mmapped :-( */
-      if(Os.IS_WINDOWS)
+      if (OperatingSystem.IS_WINDOWS)
         forceUnmap(mmap);
       try {
         raf.setLength(roundedNewSize)
@@ -217,12 +216,11 @@ abstract class AbstractIndex[K, V](@volatile var file: File, val baseOffset: Lon
    * and this requires synchronizing reads.
    */
   protected def maybeLock[T](lock: Lock)(fun: => T): T = {
-    if(Os.IS_WINDOWS)
+    if (OperatingSystem.IS_WINDOWS)
       lock.lock()
-    try {
-      fun
-    } finally {
-      if(Os.IS_WINDOWS)
+    try fun
+    finally {
+      if (OperatingSystem.IS_WINDOWS)
         lock.unlock()
     }
   }