From 9dd7c60d15765d5d1d802d50d8f3a0f154e0f2e6 Mon Sep 17 00:00:00 2001 From: MishaDemianenko Date: Sat, 10 Feb 2018 17:14:52 +0100 Subject: [PATCH] Set of small cleanups Make some classes static, close file reader, use entry set iterators --- .../src/main/java/org/neo4j/commandline/Util.java | 11 ++++++++++- .../org/neo4j/diagnostics/DiagnosticsReporter.java | 6 +++--- .../impl/coreapi/TxStateTransactionDataSnapshot.java | 4 ++-- .../labelscan/CompositeLabelScanValueIterator.java | 2 +- .../schema/NativeNonUniqueSchemaIndexPopulator.java | 3 --- .../impl/index/schema/fusion/FusionIndexReader.java | 2 +- .../impl/store/id/ReadOnlyIdGeneratorFactory.java | 2 +- .../participant/NativeLabelScanStoreMigrator.java | 2 +- .../storemigration/participant/StoreMigrator.java | 2 +- .../impl/util/concurrent/LockWaitStrategies.java | 4 ++-- .../impl/util/dbstructure/DbStructureCollector.java | 2 +- .../batchinsert/internal/BatchInserterImpl.java | 4 +--- .../cache/idmapping/string/StringEncoder.java | 2 +- .../fulltext/integrations/bloom/BloomProcedures.java | 4 ++-- .../java/org/neo4j/metrics/source/db/BoltMetrics.java | 2 +- 15 files changed, 28 insertions(+), 24 deletions(-) diff --git a/community/command-line/src/main/java/org/neo4j/commandline/Util.java b/community/command-line/src/main/java/org/neo4j/commandline/Util.java index 1d8ed3abee8c..a864a157d7cf 100644 --- a/community/command-line/src/main/java/org/neo4j/commandline/Util.java +++ b/community/command-line/src/main/java/org/neo4j/commandline/Util.java @@ -21,6 +21,7 @@ import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Properties; @@ -109,7 +110,7 @@ public static String neo4jVersion() Properties props = new Properties(); try { - props.load( Util.class.getResourceAsStream( "/org/neo4j/commandline/build.properties" ) ); + loadProperties( props ); return props.getProperty( "neo4jVersion" ); } catch ( IOException e ) @@ -118,4 +119,12 @@ public static String neo4jVersion() throw new RuntimeException( e ); } } + + private static void loadProperties( Properties props ) throws IOException + { + try ( InputStream resource = Util.class.getResourceAsStream( "/org/neo4j/commandline/build.properties" ) ) + { + props.load( resource ); + } + } } diff --git a/community/kernel/src/main/java/org/neo4j/diagnostics/DiagnosticsReporter.java b/community/kernel/src/main/java/org/neo4j/diagnostics/DiagnosticsReporter.java index ffe456a9fccc..27caaeea41bf 100644 --- a/community/kernel/src/main/java/org/neo4j/diagnostics/DiagnosticsReporter.java +++ b/community/kernel/src/main/java/org/neo4j/diagnostics/DiagnosticsReporter.java @@ -66,11 +66,11 @@ public void dump( Set classifiers, Path destination, DiagnosticsReporter } // Add additional sources - for ( String classifier : additionalSources.keySet() ) + for ( Map.Entry> classifier : additionalSources.entrySet() ) { - if ( classifiers.contains( "all" ) || classifiers.contains( classifier ) ) + if ( classifiers.contains( "all" ) || classifiers.contains( classifier.getKey() ) ) { - sources.addAll( additionalSources.get( classifier ) ); + sources.addAll( classifier.getValue() ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataSnapshot.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataSnapshot.java index 15f0338c844d..c74b24eea299 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataSnapshot.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataSnapshot.java @@ -40,8 +40,8 @@ import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.impl.api.KernelTransactionImplementation; -import org.neo4j.kernel.impl.core.NodeProxy; import org.neo4j.kernel.impl.core.EmbeddedProxySPI; +import org.neo4j.kernel.impl.core.NodeProxy; import org.neo4j.kernel.impl.core.RelationshipProxy; import org.neo4j.kernel.impl.locking.Lock; import org.neo4j.storageengine.api.NodeItem; @@ -465,7 +465,7 @@ public String toString() } } - private class RelationshipPropertyEntryView implements PropertyEntry + private static class RelationshipPropertyEntryView implements PropertyEntry { private final Relationship relationship; private final String key; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/CompositeLabelScanValueIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/CompositeLabelScanValueIterator.java index 3123b6263032..fbfe5838c279 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/CompositeLabelScanValueIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/CompositeLabelScanValueIterator.java @@ -102,7 +102,7 @@ public void close() toClose.clear(); } - private class IdAndSource implements Comparable + private static class IdAndSource implements Comparable { private long latestReturned; private final PrimitiveLongIterator source; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaIndexPopulator.java index 9a9f138cee09..e090e1542a55 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaIndexPopulator.java @@ -40,15 +40,12 @@ class NativeNonUniqueSchemaIndexPopulator extends NativeSchemaIndexPopulator { - private final IndexSamplingConfig samplingConfig; - private boolean updateSampling; private NonUniqueIndexSampler sampler; NativeNonUniqueSchemaIndexPopulator( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, IndexSamplingConfig samplingConfig, SchemaIndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId ) { super( pageCache, fs, storeFile, layout, monitor, descriptor, indexId ); - this.samplingConfig = samplingConfig; this.sampler = new DefaultNonUniqueIndexSampler( samplingConfig.sampleSizeLimit() ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReader.java index aa61a4298e37..f67dfa6b09b6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReader.java @@ -176,7 +176,7 @@ public boolean hasFullNumberPrecision( IndexQuery... predicates ) /** * Combine multiple progressor to act like one single logical progressor seen from clients perspective. */ - private class BridgingIndexProgressor implements IndexProgressor.NodeValueClient, IndexProgressor + private static class BridgingIndexProgressor implements IndexProgressor.NodeValueClient, IndexProgressor { private final NodeValueClient client; private final int[] keys; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/id/ReadOnlyIdGeneratorFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/id/ReadOnlyIdGeneratorFactory.java index 7b0cffde5244..4983a2b1d6a0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/id/ReadOnlyIdGeneratorFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/id/ReadOnlyIdGeneratorFactory.java @@ -74,7 +74,7 @@ public IdGenerator get( IdType idType ) return idGenerators.get( idType ); } - class ReadOnlyIdGenerator implements IdGenerator + static class ReadOnlyIdGenerator implements IdGenerator { private final long highId; private final long defragCount; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/NativeLabelScanStoreMigrator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/NativeLabelScanStoreMigrator.java index afa4e90ace77..35e90deb6626 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/NativeLabelScanStoreMigrator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/NativeLabelScanStoreMigrator.java @@ -160,7 +160,7 @@ private static File getLuceneStoreDirectory( File storeRootDir ) return new File( new File( new File( storeRootDir, "schema" ), "label" ), "lucene" ); } - private class MonitoredFullLabelStream extends FullLabelStream + private static class MonitoredFullLabelStream extends FullLabelStream { private final ProgressReporter progressReporter; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigrator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigrator.java index 3a5d933f80df..93e05cd5b720 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigrator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigrator.java @@ -740,7 +740,7 @@ private void copyWithPageCache( File sourceFile, File targetFile ) throws IOExce } } - private class BatchImporterProgressMonitor extends CoarseBoundedProgressExecutionMonitor + private static class BatchImporterProgressMonitor extends CoarseBoundedProgressExecutionMonitor { private final ProgressReporter progressReporter; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/concurrent/LockWaitStrategies.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/concurrent/LockWaitStrategies.java index 7f3e6a4bf76d..ae98658f56e1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/concurrent/LockWaitStrategies.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/concurrent/LockWaitStrategies.java @@ -49,8 +49,8 @@ public void apply( long iteration ) throws AcquireLockTimeoutException }, INCREMENTAL_BACKOFF { - private final int spinIterations = 1000; - private final long multiplyUntilIteration = spinIterations + 2; + private static final int spinIterations = 1000; + private static final long multiplyUntilIteration = spinIterations + 2; @Override public void apply( long iteration ) throws AcquireLockTimeoutException diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollector.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollector.java index 58a7dd7f7823..375b4a7d627a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollector.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollector.java @@ -331,7 +331,7 @@ public int hashCode() } } - private class IndexStatistics + private static class IndexStatistics { private final double uniqueValuesPercentage; private final long size; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java index 06fa4c06b1eb..94d981f72a69 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java @@ -59,8 +59,6 @@ import org.neo4j.io.pagecache.tracing.PageCacheTracer; import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracerSupplier; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; -import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.PropertyAccessor; @@ -1303,7 +1301,7 @@ public void forceFlush() private static class IndexPopulatorWithSchema extends IndexPopulator.Adapter implements LabelSchemaSupplier { - private final int batchSize = 1_000; + private static final int batchSize = 1_000; private final IndexPopulator populator; private final IndexDescriptor index; private Collection> batchedUpdates = new ArrayList<>( batchSize ); diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/StringEncoder.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/StringEncoder.java index 8556251749ae..550fecd9d632 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/StringEncoder.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/StringEncoder.java @@ -36,7 +36,7 @@ public class StringEncoder implements Encoder // fixed values private final int numCodes; - private final int encodingThreshold = 7; + private static final int encodingThreshold = 7; // data changing over time, potentially with each encoding private final byte[] reMap = new byte[256]; diff --git a/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomProcedures.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomProcedures.java index af806f2c8b74..bf811b79fdd0 100644 --- a/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomProcedures.java +++ b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomProcedures.java @@ -23,11 +23,11 @@ import java.util.function.Function; import java.util.stream.Stream; +import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.api.impl.fulltext.FulltextProvider; import org.neo4j.kernel.api.impl.fulltext.ReadOnlyFulltext; import org.neo4j.kernel.api.impl.fulltext.ScoreEntityIterator; import org.neo4j.kernel.api.impl.fulltext.ScoreEntityIterator.ScoreEntry; -import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.procedure.Context; import org.neo4j.procedure.Description; import org.neo4j.procedure.Name; @@ -156,7 +156,7 @@ public static class PropertyOutput } } - public class StatusOutput + public static class StatusOutput { public final String state; diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/db/BoltMetrics.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/db/BoltMetrics.java index 97b93eabb8b5..403d667f6f9a 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/db/BoltMetrics.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/db/BoltMetrics.java @@ -87,7 +87,7 @@ public void stop() monitors.removeMonitorListener( boltMonitor ); } - private class BoltMetricsMonitor implements MonitoredWorkerFactory.SessionMonitor + private static class BoltMetricsMonitor implements MonitoredWorkerFactory.SessionMonitor { final AtomicLong sessionsStarted = new AtomicLong();