From 65b5506c028ad8b857b827909efe417cce08198a Mon Sep 17 00:00:00 2001 From: Chris Vest Date: Tue, 23 Jan 2018 14:57:06 +0100 Subject: [PATCH] Move the OsBeanUtil to the io module so it can be accessed in sub-kernel modules. --- .../neo4j/commandline/dbms/MemoryRecommendationsCommand.java | 2 +- .../import-tool/src/main/java/org/neo4j/tooling/ImportTool.java | 2 +- .../util => io/src/main/java/org/neo4j/io/os}/OsBeanUtil.java | 2 +- .../kernel/impl/pagecache/ConfiguringPageCacheFactory.java | 2 +- .../src/main/java/org/neo4j/kernel/info/SystemDiagnostics.java | 2 +- .../java/org/neo4j/unsafe/impl/batchimport/Configuration.java | 2 +- .../batchimport/staging/OnDemandDetailsExecutionMonitor.java | 2 +- .../neo4j/src/test/java/files/TestNoFileDescriptorLeaks.java | 2 +- .../org/neo4j/ext/udc/impl/DefaultUdcInformationCollector.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename community/{kernel/src/main/java/org/neo4j/kernel/impl/util => io/src/main/java/org/neo4j/io/os}/OsBeanUtil.java (99%) diff --git a/community/dbms/src/main/java/org/neo4j/commandline/dbms/MemoryRecommendationsCommand.java b/community/dbms/src/main/java/org/neo4j/commandline/dbms/MemoryRecommendationsCommand.java index 5592f710974cb..3dfd06023c808 100644 --- a/community/dbms/src/main/java/org/neo4j/commandline/dbms/MemoryRecommendationsCommand.java +++ b/community/dbms/src/main/java/org/neo4j/commandline/dbms/MemoryRecommendationsCommand.java @@ -27,7 +27,7 @@ import org.neo4j.commandline.admin.OutsideWorld; import org.neo4j.commandline.arguments.Arguments; import org.neo4j.commandline.arguments.OptionalNamedArg; -import org.neo4j.kernel.impl.util.OsBeanUtil; +import org.neo4j.io.os.OsBeanUtil; import static java.lang.String.format; import static org.neo4j.configuration.ExternalSettings.initialHeapSize; diff --git a/community/import-tool/src/main/java/org/neo4j/tooling/ImportTool.java b/community/import-tool/src/main/java/org/neo4j/tooling/ImportTool.java index 011ec6cc430d4..1761189bb1abe 100644 --- a/community/import-tool/src/main/java/org/neo4j/tooling/ImportTool.java +++ b/community/import-tool/src/main/java/org/neo4j/tooling/ImportTool.java @@ -53,7 +53,7 @@ import org.neo4j.kernel.impl.logging.StoreLogService; import org.neo4j.kernel.impl.store.format.RecordFormatSelector; import org.neo4j.kernel.impl.util.Converters; -import org.neo4j.kernel.impl.util.OsBeanUtil; +import org.neo4j.io.os.OsBeanUtil; import org.neo4j.kernel.impl.util.Validator; import org.neo4j.kernel.impl.util.Validators; import org.neo4j.kernel.internal.Version; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/OsBeanUtil.java b/community/io/src/main/java/org/neo4j/io/os/OsBeanUtil.java similarity index 99% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/util/OsBeanUtil.java rename to community/io/src/main/java/org/neo4j/io/os/OsBeanUtil.java index cc9c7a0f4273f..e55071a4104da 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/OsBeanUtil.java +++ b/community/io/src/main/java/org/neo4j/io/os/OsBeanUtil.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.impl.util; +package org.neo4j.io.os; import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactory.java index ea6a4dbc6ee51..dcb008c0fd5a6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactory.java @@ -30,7 +30,7 @@ import org.neo4j.io.pagecache.tracing.PageCacheTracer; import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracerSupplier; import org.neo4j.kernel.configuration.Config; -import org.neo4j.kernel.impl.util.OsBeanUtil; +import org.neo4j.io.os.OsBeanUtil; import org.neo4j.logging.Log; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.mapped_memory_page_size; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/info/SystemDiagnostics.java b/community/kernel/src/main/java/org/neo4j/kernel/info/SystemDiagnostics.java index fc5f9b5116f94..a0facf4205309 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/info/SystemDiagnostics.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/info/SystemDiagnostics.java @@ -46,7 +46,7 @@ import java.util.TimeZone; import java.util.stream.Stream; -import org.neo4j.kernel.impl.util.OsBeanUtil; +import org.neo4j.io.os.OsBeanUtil; import org.neo4j.logging.Logger; import static java.net.NetworkInterface.getNetworkInterfaces; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/Configuration.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/Configuration.java index 9911425ea615d..0955cfa859e0a 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/Configuration.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/Configuration.java @@ -22,7 +22,7 @@ import org.neo4j.io.ByteUnit; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.pagecache.ConfiguringPageCacheFactory; -import org.neo4j.kernel.impl.util.OsBeanUtil; +import org.neo4j.io.os.OsBeanUtil; import org.neo4j.unsafe.impl.batchimport.staging.Stage; import org.neo4j.unsafe.impl.batchimport.staging.Step; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/OnDemandDetailsExecutionMonitor.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/OnDemandDetailsExecutionMonitor.java index 92ddb5cb04aec..8141371846abe 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/OnDemandDetailsExecutionMonitor.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/OnDemandDetailsExecutionMonitor.java @@ -35,7 +35,7 @@ import org.neo4j.helpers.collection.Pair; import org.neo4j.kernel.impl.cache.MeasureDoNothing; import org.neo4j.kernel.impl.cache.MeasureDoNothing.CollectingMonitor; -import org.neo4j.kernel.impl.util.OsBeanUtil; +import org.neo4j.io.os.OsBeanUtil; import org.neo4j.unsafe.impl.batchimport.stats.DetailLevel; import org.neo4j.unsafe.impl.batchimport.stats.Keys; import org.neo4j.unsafe.impl.batchimport.stats.Stat; diff --git a/community/neo4j/src/test/java/files/TestNoFileDescriptorLeaks.java b/community/neo4j/src/test/java/files/TestNoFileDescriptorLeaks.java index b51fd8e1ce7d2..95a9b7d81ffd6 100644 --- a/community/neo4j/src/test/java/files/TestNoFileDescriptorLeaks.java +++ b/community/neo4j/src/test/java/files/TestNoFileDescriptorLeaks.java @@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.impl.util.OsBeanUtil; +import org.neo4j.io.os.OsBeanUtil; import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.hamcrest.Matchers.lessThan; diff --git a/community/udc/src/main/java/org/neo4j/ext/udc/impl/DefaultUdcInformationCollector.java b/community/udc/src/main/java/org/neo4j/ext/udc/impl/DefaultUdcInformationCollector.java index bdb46c25c4ac8..3704fd7b7a100 100644 --- a/community/udc/src/main/java/org/neo4j/ext/udc/impl/DefaultUdcInformationCollector.java +++ b/community/udc/src/main/java/org/neo4j/ext/udc/impl/DefaultUdcInformationCollector.java @@ -42,7 +42,7 @@ import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.transaction.state.DataSourceManager; -import org.neo4j.kernel.impl.util.OsBeanUtil; +import org.neo4j.io.os.OsBeanUtil; import org.neo4j.storageengine.api.StoreFileMetadata; import org.neo4j.udc.UsageData; import org.neo4j.udc.UsageDataKeys;