From 0f9b33a83b41687c9a968fa9da257c604950d413 Mon Sep 17 00:00:00 2001 From: MishaDemianenko Date: Sat, 29 Apr 2017 02:16:56 +0200 Subject: [PATCH] ParenPad checkstyle rule Add new rule, upgrade checkstyle version. Fix violations --- build/checkstyle.xml | 5 + .../neo4j/bolt/security/ssl/Certificates.java | 6 +- .../bolt/v1/messaging/BoltIOException.java | 4 +- .../bolt/v1/messaging/BoltMessageRouter.java | 2 +- .../neo4j/bolt/v1/messaging/Neo4jPack.java | 8 +- .../packstream/utf8/SunMiscUTF8Encoder.java | 4 +- .../bolt/v1/runtime/CypherAdapterStream.java | 2 +- .../org/neo4j/bolt/v1/runtime/Neo4jError.java | 11 +- .../v1/runtime/TransactionStateMachine.java | 6 +- .../bolt/v1/runtime/bookmarking/Bookmark.java | 2 +- .../security/ssl/KeyStoreFactoryTest.java | 8 +- .../ssl/TestSslCertificateFactory.java | 4 +- .../v1/messaging/message/InitMessage.java | 12 +- .../v1/messaging/util/MessageMatchers.java | 6 +- .../v1/packstream/BufferedChannelInput.java | 2 +- .../bolt/v1/packstream/PackStreamTest.java | 2 +- .../v1/runtime/integration/BoltConfigIT.java | 14 +- .../transport/integration/ConnectionIT.java | 6 +- .../integration/Neo4jWithSocket.java | 10 +- .../integration/TestNotification.java | 28 +- .../integration/TransportErrorIT.java | 4 +- .../socket/client/SocketConnection.java | 4 +- .../socket/client/WebSocketConnection.java | 2 +- .../java/org/neo4j/codegen/ByteCodeUtils.java | 6 +- .../org/neo4j/codegen/ClassGenerator.java | 4 +- .../java/org/neo4j/codegen/ClassHandle.java | 2 +- .../org/neo4j/codegen/ExpressionTemplate.java | 2 +- .../org/neo4j/codegen/ExpressionVisitor.java | 2 +- .../org/neo4j/codegen/LocalVariables.java | 4 +- .../java/org/neo4j/codegen/MethodEmitter.java | 2 +- .../org/neo4j/codegen/MethodReference.java | 7 +- .../org/neo4j/codegen/MethodTemplate.java | 6 +- .../java/org/neo4j/codegen/TypeReference.java | 40 ++- .../codegen/source/MethodSourceWriter.java | 4 +- .../org/neo4j/codegen/ByteCodeUtilsTest.java | 2 +- .../org/neo4j/codegen/CodeGenerationTest.java | 6 +- .../neo4j/helpers/collection/Iterables.java | 21 +- .../neo4j/helpers/collection/Iterators.java | 12 +- .../org/neo4j/helpers/collection/MapUtil.java | 38 +- .../collection/ResourceClosingIterator.java | 2 +- .../org/neo4j/helpers/collection/Visitor.java | 2 +- .../helpers/collection/LruCacheTest.java | 14 +- .../commandline/arguments/ArgumentsTest.java | 2 +- .../java/org/neo4j/function/Predicates.java | 2 +- .../neo4j/kernel/api/exceptions/Status.java | 22 +- .../neo4j/kernel/lifecycle/LifeSupport.java | 14 +- .../kernel/lifecycle/LifecycleException.java | 2 +- .../kernel/lifecycle/LifecycleListener.java | 2 +- .../org/neo4j/function/SuppliersTest.java | 8 +- .../org/neo4j/kernel/lifecycle/LifeRule.java | 2 +- .../kernel/lifecycle/LifeSupportTest.java | 183 +++++----- .../lifecycle/TestLifecycleException.java | 20 +- .../java/org/neo4j/test/rule/RepeatRule.java | 4 +- .../org/neo4j/test/rule/SuppressOutput.java | 6 +- .../neo4j/configuration/ExternalSettings.java | 2 +- .../consistency/CheckConsistencyCommand.java | 2 +- .../consistency/ConsistencyCheckService.java | 10 +- .../consistency/ConsistencyCheckSettings.java | 12 +- .../consistency/ConsistencyCheckTool.java | 3 +- .../consistency/ConsistencyReportLog.java | 2 +- .../consistency/checking/CheckDecorator.java | 16 +- .../consistency/checking/DynamicStore.java | 2 +- .../checking/cache/CacheAccess.java | 2 +- .../checking/full/DynamicOwner.java | 2 +- .../consistency/checking/full/FullCheck.java | 4 +- .../consistency/checking/full/OwnerCheck.java | 4 +- .../full/PropertyAndNodeIndexedCheck.java | 2 +- .../repair/RelationshipChainDirection.java | 8 +- .../consistency/report/ConsistencyReport.java | 4 +- .../report/ConsistencyReporter.java | 6 +- .../store/CacheSmallStoresRecordAccess.java | 2 +- .../consistency/store/DirectRecordAccess.java | 2 +- .../consistency/store/RecordReference.java | 2 +- .../checking/DynamicRecordCheckTest.java | 8 +- .../checking/GraphStoreFixture.java | 2 +- .../checking/NodeRecordCheckTest.java | 2 +- .../checking/RecordCheckTestBase.java | 4 +- .../checking/full/DuplicatePropertyTest.java | 3 +- .../full/ExecutionOrderIntegrationTest.java | 6 +- .../full/FullCheckIntegrationTest.java | 2 +- .../checking/full/MultiPassStoreTest.java | 16 +- .../checking/full/RecordScannerTest.java | 8 +- .../checking/full/StoreProcessorTaskTest.java | 4 +- .../OwningNodeRelationshipChainTest.java | 3 +- .../report/ConsistencyReporterTest.java | 16 +- .../report/PendingReferenceCheckTest.java | 3 +- .../CacheSmallStoresRecordAccessTest.java | 4 +- .../consistency/store/RecordAccessStub.java | 6 +- .../ParallelBatchImporterTest.java | 2 +- .../java/org/neo4j/csv/reader/Extractors.java | 4 +- .../org/neo4j/csv/reader/ExtractorsTest.java | 4 +- .../org/neo4j/csv/reader/ReadablesTest.java | 4 +- .../internal/compiler/v3_2/ResultRowImpl.java | 4 +- .../v3_2/common/CypherOrderability.java | 4 +- .../v3_2/executionplan/EntityAccessor.java | 5 +- .../neo4j/cypher/export/DatabaseSubGraph.java | 6 +- .../codegen/CompiledConversionUtils.java | 8 +- .../codegen/CompiledEquivalenceUtils.java | 4 +- .../internal/codegen/CompiledMathHelper.java | 10 +- .../internal/codegen/NodeIdWrapperImpl.java | 8 +- .../codegen/RelationshipIdWrapperImpl.java | 8 +- .../CommunityCypherEngineProvider.java | 4 +- .../internal/javacompat/ExecutionResult.java | 2 +- .../cypher/DeleteRelationshipStressIT.java | 2 +- .../GraphDatabaseServiceExecuteTest.java | 8 +- .../neo4j/cypher/ManyMergesStressTest.java | 2 +- .../org/neo4j/cypher/export/ExportTest.java | 2 +- .../cypher/internal/javacompat/GraphImpl.java | 2 +- .../JavaValueCompatibilityTest.java | 2 +- .../NotificationAcceptanceTest.java | 19 +- .../dbms/CannotWriteException.java | 2 +- .../impl/path/DijkstraBidirectional.java | 2 +- .../graphalgo/impl/path/ShortestPath.java | 4 +- .../graphalgo/impl/util/DoubleComparator.java | 2 +- .../graphalgo/impl/util/IntegerAdder.java | 2 +- .../impl/util/IntegerComparator.java | 2 +- .../graphalgo/impl/util/IntegerEvaluator.java | 2 +- .../java/org/neo4j/graphalgo/UtilTest.java | 8 +- .../graphalgo/path/GeoDataGenerator.java | 2 +- .../org/neo4j/graphdb/DependencyResolver.java | 4 +- .../java/org/neo4j/graphdb/DynamicLabel.java | 2 +- .../java/org/neo4j/graphdb/InputPosition.java | 18 +- .../InvalidTransactionTypeException.java | 4 +- .../graphdb/NotInTransactionException.java | 4 +- .../neo4j/graphdb/PathExpanderBuilder.java | 2 +- .../java/org/neo4j/graphdb/PathExpanders.java | 10 +- .../config/InvalidSettingException.java | 4 +- .../BidirectionalTraversalBranchPath.java | 6 +- .../StandardBranchCollisionDetector.java | 2 +- .../index/IndexPopulationProgress.java | 2 +- .../org/neo4j/graphdb/spatial/Coordinate.java | 8 +- .../BidirectionalUniquenessFilter.java | 2 +- .../graphdb/traversal/PathEvaluator.java | 2 +- .../neo4j/graphdb/traversal/PathUnique.java | 2 +- .../graphdb/traversal/RecentlyUnique.java | 3 +- .../java/org/neo4j/tooling/ImportTool.java | 4 +- .../java/org/neo4j/tooling/CsvOutput.java | 4 +- .../neo4j/tooling/EntityDataGenerator.java | 4 +- .../org/neo4j/tooling/ImportToolTest.java | 10 +- .../gbptree/CrashGenerationCleaner.java | 2 +- .../neo4j/index/internal/gbptree/GBPTree.java | 4 +- .../neo4j/index/internal/gbptree/Header.java | 4 +- .../index/internal/gbptree/TreeNode.java | 2 +- .../index/internal/gbptree/TreeState.java | 24 +- .../io/fs/DefaultFileSystemAbstraction.java | 6 +- .../io/fs/FileSystemLifecycleAdapter.java | 2 +- .../main/java/org/neo4j/io/fs/FileUtils.java | 24 +- .../pagecache/impl/SingleFilePageSwapper.java | 8 +- .../cursor/DefaultPageCursorTracer.java | 6 +- .../neo4j/adversaries/AbstractAdversary.java | 2 +- .../adversaries/ClassGuardedAdversary.java | 2 +- .../fs/AdversarialFileSystemAbstraction.java | 4 +- ...FileSystemAbstractionInterruptionTest.java | 35 +- .../SelectiveFileSystemAbstractionTest.java | 10 +- .../org/neo4j/io/pagecache/PageCacheTest.java | 28 +- .../io/pagecache/impl/ByteBufferPage.java | 4 +- .../randomharness/PageCountRecordFormat.java | 8 +- .../randomharness/StandardRecordFormat.java | 15 +- .../neo4j/test/impl/ChannelInputStream.java | 2 +- .../org/neo4j/test/rule/TestDirectory.java | 4 +- .../src/main/java/org/neo4j/jmx/JmxUtils.java | 4 +- .../neo4j/jmx/impl/JmxExtensionFactory.java | 4 +- .../org/neo4j/jmx/impl/StoreFileBean.java | 3 +- .../factory/GraphDatabaseFactoryState.java | 2 +- .../factory/GraphDatabaseSettings.java | 187 +++++----- .../src/main/java/org/neo4j/helpers/Args.java | 2 +- .../helpers/ProcessFailureException.java | 2 +- .../java/org/neo4j/helpers/RunCarefully.java | 2 +- .../main/java/org/neo4j/helpers/Strings.java | 2 +- .../src/main/java/org/neo4j/helpers/Uris.java | 2 +- .../neo4j/helpers/progress/Aggregator.java | 4 +- .../neo4j/helpers/progress/Completion.java | 6 +- .../progress/ProgressMonitorFactory.java | 2 +- .../kernel/GraphDatabaseQueryService.java | 2 +- .../org/neo4j/kernel/api/ReadOperations.java | 2 +- ...InvalidTransactionTypeKernelException.java | 2 +- .../LabelNotFoundKernelException.java | 2 +- .../RelationshipTypeNotFoundException.java | 2 +- .../CreateConstraintFailureException.java | 2 +- .../schema/SchemaKernelException.java | 2 +- .../kernel/api/index/SchemaIndexProvider.java | 6 +- .../kernel/api/labelscan/LoggingMonitor.java | 2 +- .../proc/CallableUserAggregationFunction.java | 2 +- .../org/neo4j/kernel/api/proc/Neo4jTypes.java | 2 +- .../kernel/api/proc/ProcedureSignature.java | 20 +- .../api/proc/UserFunctionSignature.java | 20 +- .../api/properties/BooleanProperty.java | 2 +- .../kernel/api/properties/ByteProperty.java | 2 +- .../kernel/api/properties/CharProperty.java | 2 +- .../kernel/api/properties/IntProperty.java | 2 +- .../kernel/api/properties/LazyProperty.java | 2 +- .../kernel/api/properties/NumberProperty.java | 2 +- .../neo4j/kernel/api/properties/Property.java | 12 +- .../kernel/api/properties/ShortProperty.java | 2 +- .../kernel/api/security/SecurityContext.java | 2 +- .../exception/InvalidAuthTokenException.java | 2 +- .../builtinprocs/BuiltInDbmsProcedures.java | 2 +- .../builtinprocs/BuiltInProcedures.java | 4 +- .../builtinprocs/JmxQueryProcedure.java | 6 +- .../neo4j/kernel/configuration/Connector.java | 2 +- .../GraphDatabaseConfigurationMigrator.java | 8 +- .../configuration/GroupSettingSupport.java | 2 +- .../kernel/configuration/HttpConnector.java | 4 +- .../neo4j/kernel/configuration/Settings.java | 18 +- .../ConstraintEnforcingEntityOperations.java | 4 +- ...ntegrityValidatingStatementOperations.java | 2 +- .../impl/api/KernelSchemaStateStore.java | 16 +- .../kernel/impl/api/OperationsFacade.java | 6 +- .../impl/api/PropertyValueComparison.java | 2 +- .../StackingQueryRegistrationOperations.java | 2 +- .../impl/api/StatementOperationParts.java | 5 +- .../api/index/ContractCheckingIndexProxy.java | 2 +- .../impl/api/index/IndexMapReference.java | 2 +- .../api/index/IndexingServiceFactory.java | 4 +- .../api/index/MultipleIndexPopulator.java | 2 +- .../kernel/impl/api/index/NodeUpdates.java | 4 +- .../sampling/IndexSamplingController.java | 2 +- .../sampling/IndexSamplingJobFactory.java | 2 +- .../sampling/IndexSamplingJobTracker.java | 2 +- .../api/operations/KeyWriteOperations.java | 4 +- .../kernel/impl/api/state/StateDefaults.java | 2 +- .../kernel/impl/api/store/StorageLayer.java | 2 +- .../impl/core/GraphPropertiesProxy.java | 2 +- .../kernel/impl/core/RelationshipProxy.java | 4 +- .../impl/coreapi/PropertyContainerLocker.java | 6 +- .../impl/coreapi/TopLevelTransaction.java | 2 +- .../kernel/impl/factory/ClassicCoreSPI.java | 2 +- .../CompositeLabelScanValueIterator.java | 8 +- .../index/labelscan/NativeLabelScanStore.java | 2 +- .../labelscan/NativeLabelScanWriter.java | 2 +- .../org/neo4j/kernel/impl/locking/Locks.java | 2 +- .../impl/locking/ReentrantLockService.java | 2 +- .../kernel/impl/logging/StoreLogService.java | 8 +- .../kernel/impl/proc/FieldInjections.java | 4 +- .../impl/proc/MethodSignatureCompiler.java | 6 +- .../neo4j/kernel/impl/proc/Neo4jValue.java | 24 +- .../neo4j/kernel/impl/proc/OutputMappers.java | 16 +- .../org/neo4j/kernel/impl/proc/ParseUtil.java | 6 +- .../kernel/impl/proc/ProcedureRegistry.java | 2 +- .../proc/ReflectiveProcedureCompiler.java | 13 +- .../neo4j/kernel/impl/proc/TypeMappers.java | 15 +- .../org/neo4j/kernel/impl/security/User.java | 4 +- .../impl/store/CommonAbstractStore.java | 4 +- .../impl/store/DataInconsistencyError.java | 2 +- .../kernel/impl/store/LongerShortString.java | 12 +- .../neo4j/kernel/impl/store/PropertyType.java | 2 +- .../neo4j/kernel/impl/store/ShortArray.java | 16 +- .../neo4j/kernel/impl/store/StoreAccess.java | 2 +- .../ReusableRecordsCompositeAllocator.java | 8 +- .../impl/store/counts/CountsTracker.java | 6 +- .../impl/store/counts/keys/CountsKeyType.java | 2 +- .../impl/store/format/BaseRecordFormat.java | 4 +- .../store/id/DefaultIdGeneratorFactory.java | 3 +- .../CommunityIdTypeConfigurationProvider.java | 4 +- .../store/kvstore/AbstractKeyValueStore.java | 4 +- .../kvstore/BigEndianByteArrayBuffer.java | 2 +- .../store/kvstore/ConcurrentMapState.java | 2 +- .../kernel/impl/store/kvstore/Headers.java | 6 +- .../kernel/impl/store/kvstore/Rotation.java | 4 +- .../impl/store/kvstore/RotationState.java | 2 +- .../kernel/impl/store/kvstore/State.java | 4 +- .../kernel/impl/store/record/NodeRecord.java | 4 +- .../impl/store/record/PropertyBlock.java | 2 +- .../store/record/RelationshipGroupRecord.java | 22 +- .../impl/store/record/RelationshipRecord.java | 25 +- .../impl/storemigration/DatabaseMigrator.java | 2 +- .../impl/storemigration/StoreUpgrader.java | 2 +- .../propertydeduplication/IndexLookup.java | 2 +- .../PropertyDeduplicator.java | 5 +- .../participant/LegacyIndexMigrator.java | 4 +- .../participant/StoreMigrator.java | 4 +- .../command/PhysicalLogCommandReaderV3_0.java | 2 +- .../PhysicalLogCommandReaderV3_0_2.java | 2 +- ...PositionAwarePhysicalFlushableChannel.java | 2 +- .../transaction/log/ReadAheadLogChannel.java | 2 +- .../pruning/ThresholdBasedPruneStrategy.java | 2 +- .../impl/transaction/state/Loaders.java | 8 +- .../transaction/state/OnlineIndexUpdates.java | 2 +- .../impl/transaction/state/RecordChanges.java | 4 +- .../state/storeview/NodeStoreScan.java | 2 +- .../impl/traversal/AsOneStartBranch.java | 3 +- ...BidirectionalTraversalDescriptionImpl.java | 7 +- .../MonoDirectionalTraversalDescription.java | 4 +- .../impl/traversal/TraversalBranchImpl.java | 2 +- .../java/org/neo4j/kernel/impl/util/Bits.java | 2 +- .../org/neo4j/kernel/impl/util/Cursors.java | 2 +- .../neo4j/kernel/impl/util/Dependencies.java | 15 +- .../kernel/impl/util/DependenciesProxy.java | 6 +- .../neo4j/kernel/impl/util/HexPrinter.java | 2 +- .../kernel/impl/util/IoPrimitiveUtils.java | 2 +- .../kernel/impl/util/VersionedHashMap.java | 14 +- .../collection/ConcurrentAccessException.java | 2 +- .../util/collection/NoSuchEntryException.java | 2 +- .../impl/util/collection/SimpleBitSet.java | 2 +- .../impl/util/collection/TimedRepository.java | 2 +- .../dbstructure/DbStructureCollector.java | 4 +- .../dbstructure/GraphDbStructureGuide.java | 2 +- .../neo4j/kernel/info/DiagnosticsManager.java | 2 +- .../internal/EmbeddedGraphDatabase.java | 7 +- .../internal/TransactionEventHandlers.java | 5 +- .../org/neo4j/kernel/monitoring/Monitors.java | 6 +- .../kernel/recovery/DefaultRecoverySPI.java | 2 +- .../java/org/neo4j/procedure/Description.java | 2 +- .../main/java/org/neo4j/udc/UsageDataKey.java | 18 +- .../internal/BatchInserterImpl.java | 2 +- .../RelationshipTypeCheckerStep.java | 8 +- .../cache/NodeRelationshipCache.java | 6 +- .../impl/batchimport/input/BadCollector.java | 2 +- .../batchimport/input/InputEntityReader.java | 2 +- .../MissingRelationshipDataException.java | 2 +- .../input/csv/DeserializerFactories.java | 4 +- .../input/csv/InputRelationshipValidator.java | 10 +- .../csv/ParallelInputEntityDeserializer.java | 2 +- .../ConstraintCreatorFacadeMethods.java | 2 +- .../neo4j/graphdb/CreateAndDeleteNodesIT.java | 2 +- .../neo4j/graphdb/LabelScanStoreUpdateIT.java | 7 +- .../org/neo4j/graphdb/NodeFacadeMethods.java | 2 +- .../neo4j/graphdb/QueryExecutionTypeTest.java | 4 +- .../graphdb/RelationshipFacadeMethods.java | 4 +- .../org/neo4j/helpers/HostnamePortTest.java | 10 +- .../java/org/neo4j/helpers/ServiceTest.java | 4 +- .../GraphDatabaseFacadeFactoryTest.java | 2 +- ...exPopulationFailedKernelExceptionTest.java | 4 +- .../impl/labelscan/LabelScanStoreTest.java | 2 +- .../SchemaConstraintProviderApprovalTest.java | 4 +- .../SchemaIndexProviderApprovalTest.java | 4 +- .../index/UniqueConstraintCompatibility.java | 13 +- .../properties/PropertyConversionTest.java | 2 +- .../api/properties/PropertyEqualityTest.java | 4 +- .../api/query/ExecutingQueryStatusTest.java | 7 +- .../kernel/configuration/GroupConfigTest.java | 2 +- ...estGraphDatabaseConfigurationMigrator.java | 2 +- .../DataAndSchemaTransactionSeparationIT.java | 4 +- .../api/KernelSchemaStateFlushingTest.java | 2 +- .../kernel/impl/api/KernelStatementTest.java | 4 +- .../org/neo4j/kernel/impl/api/KernelTest.java | 2 +- .../impl/api/KernelTransactionsTest.java | 4 +- .../impl/api/PropertyValueComparisonTest.java | 4 +- .../kernel/impl/api/SchemaLoggingIT.java | 2 +- ...nsactionRepresentationCommitProcessIT.java | 2 +- .../index/ContractCheckingIndexProxyTest.java | 16 +- .../api/index/FlippableIndexProxyTest.java | 2 +- .../kernel/impl/api/index/IndexCRUDIT.java | 2 +- .../kernel/impl/api/index/IndexMapTest.java | 2 +- .../api/index/IndexPopulationJobTest.java | 2 +- .../impl/api/index/IndexRecoveryIT.java | 4 +- .../kernel/impl/api/index/IndexRestartIT.java | 2 +- .../impl/api/index/IndexStatisticsTest.java | 2 +- .../impl/api/index/IndexingServiceTest.java | 10 +- .../api/index/MultipleIndexPopulatorTest.java | 2 +- .../MultipleIndexPopulatorUpdatesTest.java | 4 +- .../InMemoryIndexProviderFactory.java | 2 +- .../sampling/IndexSamplingControllerTest.java | 8 +- .../impl/api/integrationtest/KernelIT.java | 2 +- .../KernelIntegrationTest.java | 2 +- .../NodeGetUniqueFromIndexSeekIT.java | 2 +- .../api/integrationtest/RelationshipIT.java | 4 +- .../api/integrationtest/SchemaRecoveryIT.java | 2 +- .../kernel/impl/api/state/StubCursors.java | 2 +- .../api/store/NodeLoadingIteratorTest.java | 4 +- .../StoreIteratorRelationshipCursorTest.java | 2 +- .../neo4j/kernel/impl/core/BigStoreIT.java | 2 +- .../core/NodeProxySingleRelationshipTest.java | 4 +- ...ncurrentRelationshipChainLoadingIssue.java | 3 +- .../kernel/impl/core/TestIsolationBasic.java | 4 +- .../org/neo4j/kernel/impl/core/TestNeo4j.java | 5 +- .../kernel/impl/core/TestReadOnlyNeo4j.java | 2 +- .../kernel/impl/core/TestRelationship.java | 2 +- .../impl/core/TestRelationshipCount.java | 2 +- .../impl/event/TestTransactionEvents.java | 6 +- .../impl/event/TransactionEventsIT.java | 4 +- .../NativeLabelScanStoreChaosIT.java | 4 +- .../AcquireAndReleaseLocksCompatibility.java | 2 +- .../impl/locking/DeadlockCompatibility.java | 2 +- .../locking/LockReentrancyCompatibility.java | 2 +- .../LockingCompatibilityTestSuite.java | 17 +- .../impl/locking/RWLockCompatibility.java | 2 +- .../locking/community/CommunityLocksTest.java | 2 +- .../kernel/impl/proc/FieldInjectionsTest.java | 4 +- .../proc/MethodSignatureCompilerTest.java | 10 +- .../impl/proc/ProcedureJarLoaderTest.java | 10 +- .../kernel/impl/proc/ProceduresTest.java | 4 +- .../impl/proc/ReflectiveProcedureTest.java | 22 +- .../ReflectiveProcedureWithArgumentsTest.java | 9 +- ...ReflectiveUserAggregationFunctionTest.java | 8 +- .../impl/proc/ReflectiveUserFunctionTest.java | 10 +- .../impl/proc/ResourceInjectionTest.java | 14 +- .../CommonAbstractStoreBehaviourTest.java | 2 +- ...dGeneratorRebuildFailureEmulationTest.java | 10 +- .../kernel/impl/store/NeoStoresTest.java | 2 +- .../kernel/impl/store/PropertyKeyTest.java | 2 +- .../impl/store/TestGraphProperties.java | 2 +- .../kernel/impl/store/TestStringCharset.java | 4 +- ...untsStoreCountsSnapshotSerializerTest.java | 2 +- .../impl/store/counts/CountsComputerTest.java | 2 +- .../impl/store/counts/CountsRotationTest.java | 4 +- .../impl/store/counts/CountsTrackerTest.java | 10 +- .../store/format/LimitedRecordGenerators.java | 14 +- .../RecordFormatPropertyConfiguratorTest.java | 2 +- .../impl/store/id/FreeIdKeeperTest.java | 4 +- .../store/kvstore/KeyValueWriterTest.java | 2 +- .../kvstore/RotationTimerFactoryTest.java | 4 +- .../impl/store/kvstore/StubCollector.java | 2 +- .../legacylogs/LegacyLogsTest.java | 2 +- .../legacylogs/LogEntrySortingCursorTest.java | 2 +- .../transaction/CommitContentionTest.java | 2 +- .../transaction/PhysicalLogFilesTest.java | 2 +- .../TransactionMetadataCacheTest.java | 2 +- .../transaction/TransactionMonitorTest.java | 2 +- ...ingTransactionAppenderConcurrencyTest.java | 2 +- .../PhysicalLogicalTransactionStoreTest.java | 2 +- .../log/checkpoint/CheckPointerImplTest.java | 6 +- .../entry/LogEntryParserDispatcherV6Test.java | 6 +- .../transaction/log/entry/TestTxEntries.java | 4 +- .../log/pruning/TestLogPruning.java | 2 +- .../TransactionRepresentationFactory.java | 2 +- .../state/IntegrityValidatorTest.java | 4 +- .../transaction/state/NodeCommandTest.java | 2 +- .../storeview/NeoStoreIndexStoreViewTest.java | 16 +- .../impl/traversal/DepthPitfallGraphTest.java | 2 +- .../impl/traversal/SmallestGraphEverTest.java | 4 +- .../impl/traversal/TestBranchState.java | 2 +- .../kernel/impl/traversal/TestSorting.java | 2 +- .../traversal/TestTraversalWithIterable.java | 4 +- .../impl/traversal/TraversalTestBase.java | 2 +- .../kernel/impl/traversal/TreeGraphTest.java | 4 +- .../kernel/impl/util/CappedLoggerTest.java | 2 +- .../neo4j/kernel/impl/util/TestArrayMap.java | 46 +-- .../impl/util/VersionedHashMapTest.java | 2 +- .../util/collection/SimpleBitSetTest.java | 12 +- .../util/collection/TimedRepositoryTest.java | 4 +- .../recovery/LatestCheckPointFinderTest.java | 4 +- .../metatest/TestEphemeralFileChannel.java | 2 +- .../java/org/neo4j/test/DbRepresentation.java | 20 +- .../java/org/neo4j/test/GraphDescription.java | 2 +- .../test/LimitedFileSystemGraphDatabase.java | 2 +- .../org/neo4j/test/OnDemandJobScheduler.java | 2 +- .../src/test/java/org/neo4j/test/Race.java | 4 +- .../java/org/neo4j/test/StreamConsumer.java | 6 +- .../test/java/org/neo4j/test/TestData.java | 2 +- .../neo4j/test/TestGraphDatabaseFactory.java | 4 +- .../neo4j/test/impl/EphemeralIdGenerator.java | 2 +- .../test/mockito/answer/AwaitAnswer.java | 15 +- .../test/mockito/matcher/IterableMatcher.java | 2 +- .../test/mockito/matcher/Neo4jMatchers.java | 6 +- .../mockito/matcher/RootCauseMatcher.java | 2 +- .../neo4j/test/mockito/mock/Properties.java | 2 +- .../org/neo4j/test/rule/DatabaseRule.java | 2 +- .../neo4j/test/rule/GraphTransactionRule.java | 4 +- .../java/org/neo4j/test/rule/Resources.java | 4 +- .../test/runner/ParameterizedSuiteRunner.java | 2 +- .../org/neo4j/test/subprocess/SubProcess.java | 2 +- .../batchinsert/internal/BatchInsertTest.java | 7 +- .../cache/NodeRelationshipCacheTest.java | 4 +- .../batchimport/cache/NumberArrayTest.java | 34 +- .../csv/ExternalPropertiesDecoratorTest.java | 6 +- .../csv/InputGroupsDeserializerTest.java | 2 +- .../ParallelInputEntityDeserializerTest.java | 3 +- ...seBoundedProgressExecutionMonitorTest.java | 7 +- .../staging/TicketedProcessingTest.java | 6 +- .../logging/AbstractPrintWriterLogger.java | 8 +- .../java/org/neo4j/logging/BufferingLog.java | 22 +- .../java/org/neo4j/logging/FormattedLog.java | 2 +- .../neo4j/logging/AssertableLogProvider.java | 12 +- .../RotatingFileOutputStreamSupplierTest.java | 2 +- .../upgrade/loader/JarLoaderSupplier.java | 4 +- .../lucene/LuceneLegacyIndexUpgrader.java | 4 +- .../lucene/LuceneLegacyIndexUpgraderTest.java | 8 +- .../legacy/LuceneBatchInserterIndex.java | 2 +- .../impl/lucene/legacy/LuceneDataSource.java | 2 +- .../legacy/LuceneIndexImplementation.java | 2 +- .../impl/lucene/legacy/LuceneLegacyIndex.java | 2 +- .../lucene/legacy/LuceneTransactionState.java | 4 +- .../lucene/legacy/ReadOnlyIndexReference.java | 4 +- .../lucene/legacy/WritableIndexReference.java | 2 +- .../lucene/LuceneLabelScanStoreBuilder.java | 4 +- .../org/neo4j/index/lucene/ValueContext.java | 4 +- .../index/ReadOnlyAbstractDatabaseIndex.java | 2 +- .../partition/ReadOnlyIndexPartition.java | 2 +- .../impl/index/storage/DirectoryFactory.java | 4 +- .../impl/labelscan/LuceneLabelScanIndex.java | 2 +- .../LuceneLabelScanStoreExtension.java | 2 +- .../LuceneAllEntriesLabelScanReader.java | 2 +- ...PartitionedLuceneLabelScanStoreReader.java | 2 +- .../PartitionedLuceneLabelScanWriter.java | 2 +- .../impl/schema/LuceneDocumentStructure.java | 4 +- .../LuceneSchemaIndexProviderFactory.java | 2 +- .../DirectNonUniqueIndexSampler.java | 2 +- .../CompositeDuplicateCheckingCollector.java | 2 +- .../index/impl/lucene/legacy/Contains.java | 2 +- .../impl/lucene/legacy/IndexTypeTest.java | 2 +- .../ReadOnlyIndexReferenceFactoryTest.java | 2 +- .../lucene/legacy/TestAutoIndexReopen.java | 27 +- .../impl/lucene/legacy/TestLuceneIndex.java | 7 +- .../WritableIndexReferenceFactoryTest.java | 2 +- .../legacy/WritableIndexReferenceTest.java | 2 +- .../recovery/UniqueIndexRecoveryTest.java | 9 +- .../index/LuceneAllDocumentsReaderTest.java | 8 +- .../schema/DatabaseIndexAccessorTest.java | 4 +- .../impl/schema/UniqueIndexApplicationIT.java | 4 +- .../index/IndexingServiceIntegrationTest.java | 4 +- .../MonitorLoggingExtensionFactory.java | 2 +- .../org/neo4j/harness/TestServerBuilders.java | 2 +- .../AbstractInProcessServerBuilder.java | 4 +- .../java/org/neo4j/harness/FixturesTest.java | 28 +- .../neo4j/harness/InProcessBuilderTest.java | 2 +- .../java/org/neo4j/harness/JUnitRuleTest.java | 7 +- .../org/neo4j/harness/JavaProceduresTest.java | 2 +- .../MyUnmanagedExtension.java | 2 +- .../org/neo4j/logging/slf4j/Slf4jLog.java | 37 +- .../neo4j/logging/slf4j/Slf4jLogProvider.java | 2 +- .../src/test/java/db/DatabaseStartupTest.java | 4 +- .../neo4j/index/IndexTxStateLookupTest.java | 6 +- .../org/neo4j/index/backup/IndexBackupIT.java | 4 +- .../org/neo4j/store/watch/FileWatchIT.java | 14 +- .../neo4j/tracers/PageCacheCountersIT.java | 2 +- .../java/recovery/TestRecoveryScenarios.java | 12 +- ...ltiIndexPopulationConcurrentUpdatesIT.java | 4 +- .../StoreUpgraderInterruptionTestIT.java | 3 +- .../test/java/upgrade/StoreUpgraderTest.java | 8 +- ...stDatasourceCommitOrderDataVisibility.java | 2 +- .../collection/pool/LinkedQueuePool.java | 4 +- .../neo4j/collection/pool/MarshlandPool.java | 6 +- .../java/org/neo4j/collection/pool/Pool.java | 3 +- .../primitive/PrimitiveIntStack.java | 2 +- .../primitive/PrimitiveLongCollections.java | 2 +- .../collection/primitive/base/Empty.java | 12 +- .../org/neo4j/concurrent/DecayingFlags.java | 2 +- .../collection/pool/LinkedQueuePoolTest.java | 4 +- .../collection/pool/MarshlandPoolTest.java | 38 +- .../org/neo4j/concurrent/BinaryLatchTest.java | 6 +- .../org/neo4j/concurrent/RecentKTest.java | 6 +- .../security/auth/AbstractUserRepository.java | 6 +- .../RateLimitedAuthenticationStrategy.java | 2 +- .../security/auth/UserSerialization.java | 2 +- .../security/SetInitialPasswordCommandIT.java | 6 +- .../security/auth/FileUserRepositoryTest.java | 4 +- .../server/security/auth/InitialUserTest.java | 8 +- .../security/auth/UserSerializationTest.java | 13 +- .../neo4j/server/security/auth/UserTest.java | 4 +- .../helpers/PropertyTypeDispatcher.java | 2 +- .../rest/repr/RepresentationFormat.java | 2 +- .../server/rest/repr/RepresentationType.java | 2 +- .../neo4j/server/rest/repr/Serializer.java | 4 +- .../server/rest/repr/ValueRepresentation.java | 4 +- .../ExtensionListingFunctionalTest.java | 10 +- .../org/neo4j/server/CommunityEntryPoint.java | 2 +- .../neo4j/server/ServerCommandLineArgs.java | 2 +- .../neo4j/server/ServerStartupException.java | 2 +- .../server/configuration/ServerSettings.java | 80 +++-- .../org/neo4j/server/database/Database.java | 2 +- .../server/exception/ServerStartupErrors.java | 2 +- .../server/rest/batch/BatchOperations.java | 25 +- .../batch/NonStreamingBatchOperations.java | 14 +- .../server/rest/dbms/AuthorizationFilter.java | 2 +- .../neo4j/server/rest/dbms/UserService.java | 11 +- .../server/rest/domain/EvaluatorFactory.java | 6 +- .../neo4j/server/rest/domain/JsonHelper.java | 12 +- .../rest/domain/PropertySettingStrategy.java | 5 +- .../server/rest/management/JmxService.java | 37 +- .../server/rest/management/RootService.java | 4 +- .../management/VersionAndEditionService.java | 4 +- .../management/console/ConsoleService.java | 7 +- .../repr/ConsoleServiceRepresentation.java | 8 +- .../rest/paging/LeaseManagerProvider.java | 6 +- .../rest/repr/CypherResultRepresentation.java | 31 +- .../server/rest/repr/MapRepresentation.java | 8 +- .../repr/NodeAutoIndexRepresentation.java | 2 +- .../repr/ObjectToRepresentationConverter.java | 40 ++- .../RelationshipAutoIndexRepresentation.java | 2 +- .../repr/RepresentationFormatRepository.java | 11 +- .../server/rest/repr/StreamingFormat.java | 2 +- .../repr/formats/StreamingJsonFormat.java | 2 +- .../neo4j/server/rest/repr/util/RFC1123.java | 8 +- .../rest/security/ForbiddingSecurityRule.java | 2 +- .../server/rest/security/SecurityRule.java | 2 +- .../rest/security/UriPathWildcardMatcher.java | 8 +- .../ExecutionResultSerializer.java | 2 +- .../rest/transactional/Neo4jJsonCodec.java | 2 +- .../transactional/StatementDeserializer.java | 6 +- .../TransactionHandleRegistry.java | 2 +- ...itionalPeriodTransactionMessContainer.java | 4 +- .../rest/transactional/error/Neo4jError.java | 2 +- .../rest/web/BatchOperationService.java | 6 +- .../neo4j/server/rest/web/CypherService.java | 12 +- .../rest/web/InternalJettyServletRequest.java | 4 +- .../web/InternalJettyServletResponse.java | 2 +- .../server/rest/web/RestfulGraphDatabase.java | 334 +++++++++--------- .../server/rest/web/TransactionalService.java | 35 +- .../NoSuchScriptLanguageException.java | 2 +- .../GlobalJavascriptInitializer.java | 2 +- .../javascript/JavascriptExecutor.java | 5 +- .../javascript/WhiteListClassShutter.java | 6 +- .../ssl/SslSocketConnectorFactory.java | 4 +- .../org/neo4j/server/web/HttpHeaderUtils.java | 23 +- .../org/neo4j/server/web/Jetty9WebServer.java | 4 +- .../neo4j/server/web/SimpleUriBuilder.java | 2 +- .../neo4j/server/web/StaticContentFilter.java | 2 +- .../java/org/neo4j/server/web/WebServer.java | 5 +- .../service/DummyThirdPartyWebService.java | 15 +- .../java/org/neo4j/server/LegacyIndexIT.java | 14 +- .../server/NeoServerStartupLoggingIT.java | 2 +- .../java/org/neo4j/server/ServerConfigIT.java | 9 +- .../org/neo4j/server/ServerTestUtils.java | 4 +- .../neo4j/server/TransactionTimeoutIT.java | 10 +- .../helpers/CommunityServerBuilder.java | 6 +- .../server/helpers/FunctionalTestHelper.java | 6 +- .../modules/ManagementApiModuleTest.java | 6 +- .../modules/ThirdPartyJAXRSModuleTest.java | 3 +- .../rest/AbstractRestFunctionalTestBase.java | 2 +- .../neo4j/server/rest/BatchOperationIT.java | 6 +- .../org/neo4j/server/rest/GetOnRootIT.java | 9 +- .../java/org/neo4j/server/rest/LabelsIT.java | 26 +- .../org/neo4j/server/rest/ManageNodeIT.java | 8 +- .../server/rest/RESTRequestGenerator.java | 11 +- .../org/neo4j/server/rest/RedirectorIT.java | 4 +- .../org/neo4j/server/rest/RelationshipIT.java | 91 ++--- .../server/rest/RemoveNodePropertiesIT.java | 4 +- .../server/rest/RemoveRelationshipIT.java | 12 +- .../server/rest/SetNodePropertiesIT.java | 2 +- .../rest/SetRelationshipPropertiesIT.java | 6 +- .../org/neo4j/server/rest/TraverserIT.java | 2 +- .../rest/batch/BatchOperationsTest.java | 6 +- .../server/rest/dbms/UserServiceTest.java | 14 +- .../server/rest/domain/GraphDbHelper.java | 26 +- .../domain/PropertySettingStrategyTest.java | 14 +- .../TraversalDescriptionBuilderTest.java | 8 +- .../repr/CypherResultRepresentationTest.java | 4 +- .../repr/ExceptionRepresentationTest.java | 4 +- .../rest/repr/MapRepresentationTest.java | 6 +- .../server/rest/repr/OutputFormatTest.java | 9 +- .../rest/repr/PathRepresentationTest.java | 3 +- .../security/CommunityServerTestBase.java | 2 +- .../PermanentlyForbiddenSecurityRule.java | 2 +- .../security/UriPathWildcardMatcherTest.java | 57 +-- .../neo4j/server/rest/security/UsersIT.java | 4 +- .../streaming/StreamingBatchOperationIT.java | 6 +- .../rest/transactional/CypherQueriesIT.java | 7 +- .../ExecutionResultSerializerTest.java | 15 +- .../transactional/Neo4jJsonCodecTest.java | 14 +- .../rest/transactional/RowWriterTest.java | 9 +- .../StatementDeserializerTest.java | 9 +- .../TransactionHandleRegistryTest.java | 2 +- .../transactional/TransactionHandleTest.java | 4 +- .../rest/transactional/TransactionTest.java | 10 +- .../integration/TransactionErrorIT.java | 2 +- .../integration/TransactionMatchers.java | 6 +- .../rest/web/CollectUserAgentFilterIT.java | 2 +- .../rest/web/CollectUserAgentFilterTest.java | 2 +- .../server/rest/web/DatabaseActionsTest.java | 32 +- .../rest/web/RestfulGraphDatabaseTest.java | 17 +- ...ansactionWrappingRestfulGraphDatabase.java | 4 +- .../TestScriptExecutorFactoryRepository.java | 12 +- .../TestGlobalJavascriptInitializer.java | 2 +- .../TestJavascriptSecurityRestrictions.java | 13 +- .../javascript/TestWhiteListClassShutter.java | 10 +- .../javascript/TestWhiteListJavaWrapper.java | 14 +- .../test/java/org/neo4j/test/server/HTTP.java | 4 +- .../org/neo4j/shell/AppCommandParser.java | 4 +- .../java/org/neo4j/shell/StartClient.java | 2 +- .../main/java/org/neo4j/shell/apps/Alias.java | 2 +- .../java/org/neo4j/shell/apps/Export.java | 2 +- .../shell/impl/RemotelyAvailableServer.java | 2 +- .../org/neo4j/shell/impl/ShellBootstrap.java | 4 +- .../impl/ShellServerExtensionFactory.java | 4 +- .../neo4j/shell/impl/ShellTabCompleter.java | 2 +- .../kernel/ReadOnlyGraphDatabaseProxy.java | 4 +- .../org/neo4j/shell/kernel/apps/Begin.java | 2 +- .../org/neo4j/shell/kernel/apps/Commit.java | 2 +- .../org/neo4j/shell/kernel/apps/Rollback.java | 2 +- .../shell/kernel/apps/cypher/Explain.java | 2 +- .../shell/kernel/apps/cypher/Exporter.java | 2 +- .../neo4j/shell/kernel/apps/cypher/Using.java | 2 +- .../java/org/neo4j/shell/SessionTest.java | 10 +- .../java/org/neo4j/ext/udc/UdcSettings.java | 4 +- .../udc/impl/UdcKernelExtensionFactory.java | 2 +- .../org/neo4j/ext/udc/UdcSettingsTest.java | 2 +- .../impl/internal/dragons/FeatureToggles.java | 2 +- .../impl/internal/dragons/UnsafeUtil.java | 2 +- .../java/org/neo4j/backup/BackupService.java | 2 +- .../backup/OnlineBackupExtensionFactory.java | 2 +- .../neo4j/backup/OnlineBackupSettings.java | 4 +- .../org/neo4j/backup/BackupProtocolTest.java | 4 +- .../org/neo4j/backup/BackupToolUrisTest.java | 9 +- .../neo4j/backup/IncrementalBackupTest.java | 2 +- .../catchup/CatchUpResponseCallback.java | 2 +- .../catchup/TrackingResponseHandler.java | 2 +- .../storecopy/StoreCopyFinishedResponse.java | 11 +- .../catchup/tx/TxPullClient.java | 2 +- .../catchup/tx/TxStreamFinishedResponse.java | 13 +- .../core/consensus/LeaderContext.java | 15 +- .../core/consensus/RaftMessages.java | 28 +- .../core/consensus/log/LogPosition.java | 11 +- .../monitoring/RaftLogAppendIndexMonitor.java | 3 +- .../monitoring/RaftLogCommitIndexMonitor.java | 3 +- .../log/segmented/DumpSegmentedRaftLog.java | 2 +- .../log/segmented/OpenEndRangeMap.java | 8 +- .../log/segmented/SegmentHeader.java | 10 +- .../consensus/membership/MembershipEntry.java | 13 +- .../membership/RaftMembershipState.java | 13 +- .../consensus/outcome/AppendLogEntry.java | 11 +- .../outcome/BatchAppendLogEntries.java | 12 +- .../consensus/outcome/PruneLogCommand.java | 8 +- .../consensus/outcome/TruncateLogCommand.java | 8 +- .../replication/session/GlobalSession.java | 13 +- .../replication/session/LocalOperationId.java | 13 +- .../replication/session/LocalSession.java | 10 +- .../core/server/BatchingMessageHandler.java | 2 +- .../core/state/StateRecoveryManager.java | 2 +- .../id/ReplicatedIdAllocationRequest.java | 23 +- .../machines/locks/LeaderOnlyLockManager.java | 2 +- .../locks/ReplicatedLockTokenSerializer.java | 3 +- .../ReplicatedLockTokenStateMachine.java | 2 +- .../token/ReplicatedTokenRequest.java | 18 +- .../machines/tx/ReplicatedTransaction.java | 8 +- .../tx/ReplicatedTransactionStateMachine.java | 2 +- .../discovery/ClientConnectorAddresses.java | 2 +- .../causalclustering/identity/ClusterId.java | 8 +- .../load_balancing/Endpoint.java | 11 +- .../load_balancing/LoadBalancingResult.java | 8 +- .../load_balancing/filters/FilterChain.java | 8 +- .../filters/FirstValidRule.java | 8 +- .../filters/MinimumCountFilter.java | 8 +- .../server_policies/AnyGroupFilter.java | 8 +- .../server_policies/FilteringPolicy.java | 8 +- .../plugins/server_policies/ServerInfo.java | 10 +- .../logging/BetterMessageLogger.java | 2 +- .../messaging/EndOfStreamException.java | 2 +- .../marshalling/storeid/StoreIdMarshal.java | 2 +- ...nectRandomlyWithinServerGroupStrategy.java | 3 +- .../causalclustering/VersionDecoderTest.java | 8 +- .../causalclustering/backup/ArgsBuilder.java | 12 +- .../catchup/TimeoutLoopTest.java | 6 +- .../catchup/storecopy/RemoteStoreTest.java | 5 +- .../catchup/tx/CatchupPollingProcessTest.java | 6 +- .../core/consensus/RaftMachineTest.java | 18 +- .../core/consensus/RaftTestFixture.java | 5 +- .../core/consensus/election/Fixture.java | 6 +- .../core/consensus/log/RaftLogHelper.java | 2 +- .../consensus/log/RaftMachineLogTest.java | 2 +- .../log/segmented/FileNamesTest.java | 31 +- .../consensus/log/segmented/SegmentsTest.java | 2 +- .../membership/RaftGroupMembershipTest.java | 6 +- .../roles/AppendEntriesMessageFlowTest.java | 4 +- .../roles/AppendEntriesRequestTest.java | 8 +- .../core/consensus/roles/CandidateTest.java | 2 +- .../core/consensus/roles/ElectionTest.java | 3 +- .../core/consensus/roles/FollowerTest.java | 2 +- .../core/consensus/roles/HeartbeatTest.java | 8 +- .../roles/NonFollowerVoteRequestTest.java | 4 +- .../core/consensus/roles/VoteRequestTest.java | 4 +- .../core/consensus/vote/VotingTest.java | 2 +- .../server/BatchingMessageHandlerTest.java | 7 +- .../state/InFlightLogEntryReaderTest.java | 2 +- .../locks/LeaderOnlyLockManagerTest.java | 2 +- ...eplicatedTransactionCommitProcessTest.java | 2 +- .../discovery/SharedDiscoveryServiceIT.java | 2 +- .../procedure/GetServersProcedureV1Test.java | 2 +- .../messaging/RaftMessageProcessingTest.java | 2 +- .../scenarios/ClusterBindingIT.java | 2 +- .../scenarios/ClusterDiscoveryIT.java | 2 +- .../scenarios/ClusterOverviewIT.java | 24 +- .../ConvertNonCausalClusteringStoreIT.java | 10 +- .../scenarios/ReadReplicaReplicationIT.java | 2 +- .../org/neo4j/cluster/ClusterMonitor.java | 4 +- .../cluster/ExecutorLifecycleAdapter.java | 2 +- .../neo4j/cluster/NetworkedServerFactory.java | 9 +- .../org/neo4j/cluster/ProtocolServer.java | 2 +- .../cluster/client/ClusterClientModule.java | 2 +- .../neo4j/cluster/com/NetworkReceiver.java | 10 +- .../org/neo4j/cluster/com/NetworkSender.java | 10 +- .../paxos/PaxosClusterMemberEvents.java | 3 +- .../protocol/ConfigurationContext.java | 2 +- .../multipaxos/AcceptorInstanceStore.java | 2 +- .../multipaxos/AcceptorMessage.java | 2 +- .../InMemoryAcceptorInstanceStore.java | 13 +- .../multipaxos/LearnerMessage.java | 7 +- .../multipaxos/LearnerState.java | 2 +- .../multipaxos/PaxosInstance.java | 14 +- .../multipaxos/PaxosInstanceStore.java | 2 +- .../multipaxos/ProposerMessage.java | 5 +- .../multipaxos/ProposerState.java | 3 +- .../context/AbstractContextImpl.java | 2 +- .../context/AcceptorContextImpl.java | 2 +- .../context/ClusterContextImpl.java | 2 +- .../context/CommonContextState.java | 2 +- .../context/ElectionContextImpl.java | 18 +- .../multipaxos/context/MultiPaxosContext.java | 21 +- .../context/ProposerContextImpl.java | 7 +- .../cluster/protocol/cluster/Cluster.java | 11 +- .../cluster/ClusterConfiguration.java | 2 +- .../protocol/cluster/ClusterMessage.java | 4 +- .../cluster/protocol/snapshot/Snapshot.java | 3 +- .../protocol/snapshot/SnapshotContext.java | 5 +- .../protocol/snapshot/SnapshotProvider.java | 7 +- .../protocol/snapshot/SnapshotState.java | 7 +- .../StateMachineProxyFactory.java | 2 +- .../statemachine/StateMachineRules.java | 18 +- .../statemachine/StateTransitionListener.java | 2 +- .../statemachine/StateTransitionLogger.java | 4 +- .../cluster/timeout/FixedTimeoutStrategy.java | 8 +- .../org/neo4j/cluster/timeout/Timeouts.java | 2 +- .../cluster/FixedNetworkLatencyStrategy.java | 6 +- .../MultipleFailureLatencyStrategy.java | 10 +- .../neo4j/cluster/NetworkLatencyStrategy.java | 2 +- ...ndomDropNetworkFailureLatencyStrategy.java | 4 +- ...riptableNetworkFailureLatencyStrategy.java | 20 +- .../multipaxos/DefaultWinnerStrategyTest.java | 4 +- .../multipaxos/MultiPaxosContextTest.java | 8 +- .../multipaxos/MultiPaxosServerCluster.java | 137 ------- .../context/ClusterContextImplTest.java | 6 +- .../cluster/ClusterMembershipTest.java | 8 +- .../protocol/cluster/ClusterNetworkTest.java | 2 +- .../protocol/cluster/ClusterRandomTest.java | 77 ---- .../election/ElectionContextTest.java | 69 ++-- .../protocol/snapshot/SnapshotStateTest.java | 17 +- .../src/main/java/org/neo4j/com/Client.java | 2 +- .../org/neo4j/com/MonitorChannelHandler.java | 8 +- .../storecopy/ExternallyManagedPageCache.java | 7 +- .../neo4j/com/storecopy/MoveAfterCopy.java | 2 +- .../neo4j/com/PortRangeSocketBinderTest.java | 12 +- .../java/org/neo4j/com/ResourcePoolTest.java | 2 +- .../java/org/neo4j/com/TestCommunication.java | 6 +- .../internal/codegen/DefaultTopTable.java | 2 +- .../EnterpriseCypherEngineProvider.java | 2 +- .../test/java/cypher/SpecSuiteResources.java | 4 +- .../java/org/neo4j/kernel/ha/HaSettings.java | 41 ++- .../neo4j/kernel/ha/SlaveUpdatePuller.java | 2 +- .../cluster/HighAvailabilityMemberState.java | 33 +- .../HighAvailabilityMemberStateMachine.java | 2 +- .../kernel/ha/cluster/SwitchToSlave.java | 2 +- .../kernel/ha/com/RequestContextFactory.java | 2 +- .../kernel/ha/com/master/MasterImpl.java | 16 +- .../ha/management/BranchedStoreBean.java | 5 +- .../ClusterDatabaseInfoProvider.java | 2 +- .../ha/management/HighAvailabilityBean.java | 2 +- .../java/org/neo4j/ha/TestPullUpdates.java | 2 +- .../neo4j/ha/correctness/ClusterState.java | 18 +- .../ha/correctness/GraphVizExporter.java | 2 +- .../neo4j/ha/correctness/ProverTimeouts.java | 8 +- .../ha/correctness/TestProverTimeouts.java | 9 +- .../neo4j/ha/upgrade/RollingUpgradeIT.java | 4 +- .../org/neo4j/kernel/api/SchemaIndexHaIT.java | 15 +- .../neo4j/kernel/ha/ClusterFailoverIT.java | 2 +- .../kernel/ha/ClusterTopologyChangesIT.java | 2 +- .../ha/ConcurrentInstanceStartupIT.java | 8 +- ...FailoverWithAdditionalSlaveFailuresIT.java | 2 +- .../kernel/ha/SlaveTokenCreatorTest.java | 2 +- .../kernel/ha/TxPushStrategyConfigIT.java | 2 +- ...tializeTransactionOnMasterFromSlaveIT.java | 8 +- ...ighAvailabilityMemberStateMachineTest.java | 8 +- .../SwitchToSlaveBranchThenCopyTest.java | 3 +- .../SwitchToSlaveCopyThenBranchTest.java | 8 +- .../cluster/member/ClusterMemberMatcher.java | 2 +- .../ha/com/master/ConversationTest.java | 2 +- .../kernel/ha/com/master/MasterImplTest.java | 12 +- .../neo4j/kernel/ha/lock/ClusterLocksIT.java | 4 +- .../neo4j/kernel/impl/ha/ClusterManager.java | 2 +- .../EnterpriseBuiltInDbmsProcedures.java | 7 +- .../highlimit/RelationshipRecordFormat.java | 4 +- .../v306/RelationshipRecordFormatV3_0_6.java | 4 +- .../v310/RelationshipRecordFormatV3_1_0.java | 4 +- .../neo4j/graphdb/store/id/IdReuseTest.java | 18 +- .../store/id/RelationshipIdReuseStressIT.java | 4 +- ...PropertyExistenceConstraintCreationIT.java | 2 +- .../lock/forseti/ForsetiLocksTest.java | 2 +- .../BaseHighLimitRecordFormatTest.java | 2 +- .../highlimit/PropertyRecordFormatTest.java | 2 +- .../impl/storemigration/StoreMigrationIT.java | 2 +- .../neo4j/management/ClusterMemberInfo.java | 4 +- .../org/neo4j/management/Diagnostics.java | 2 +- .../management/IndexSamplingManager.java | 4 +- .../impl/HotspotManagementSupport.java | 4 +- .../neo4j/management/impl/KernelProxy.java | 2 +- .../management/impl/LockManagerBean.java | 2 +- .../neo4j/management/impl/PageCacheBean.java | 2 +- .../impl/TransactionManagerBean.java | 2 +- .../neo4j/management/TestLockManagerBean.java | 2 +- .../impl/IndexSamplingManagerBeanTest.java | 6 +- .../causalclustering/CatchUpMetrics.java | 10 +- .../source/causalclustering/CoreMetrics.java | 18 +- .../causalclustering/ReadReplicaMetrics.java | 2 +- .../org/neo4j/metrics/MetricsTestHelper.java | 2 +- .../harness/EnterpriseTestServerBuilders.java | 2 +- .../EnterpriseInProcessServerBuilderTest.java | 6 +- .../query/QueryLoggerKernelExtension.java | 7 +- .../kernel/impl/query/QueryLoggerIT.java | 14 +- .../auth/InternalFlatFileRealm.java | 4 +- .../enterprise/auth/ShiroAuthToken.java | 2 +- .../auth/ShiroAuthenticationInfo.java | 2 +- .../enterprise/auth/BoltInteraction.java | 6 +- .../BuiltInProceduresInteractionTestBase.java | 2 +- .../enterprise/auth/EmbeddedInteraction.java | 2 +- .../auth/FileRoleRepositoryTest.java | 4 +- .../auth/InternalFlatFileRealmIT.java | 2 +- .../enterprise/auth/LdapCachingTest.java | 2 +- .../auth/MultiRealmAuthManagerTest.java | 11 +- .../enterprise/auth/NeoInteractionLevel.java | 2 +- .../auth/ProcedureInteractionTestBase.java | 4 +- .../enterprise/auth/ThreadedTransaction.java | 2 +- .../ThreadedTransactionPeriodicCommit.java | 5 +- .../bolt/BoltConnectionManagementIT.java | 4 +- .../enterprise/ArbiterBootstrapper.java | 4 +- .../enterprise/EnterpriseServerSettings.java | 10 +- .../rest/CoreDatabaseAvailabilityService.java | 6 +- .../neo4j/server/rest/MasterInfoService.java | 18 +- ...eadReplicaDatabaseAvailabilityService.java | 3 +- .../NeoServerRestartTestEnterprise.java | 6 +- .../DumpPortListenerOnNettyBindFailure.java | 2 +- .../helpers/EnterpriseServerBuilder.java | 3 +- .../security/AbstractRESTInteraction.java | 2 +- .../scenarios/BoltCausalClusteringIT.java | 4 +- .../java/org/neo4j/procedure/ProcedureIT.java | 46 +-- .../procedure/UserAggregationFunctionIT.java | 2 +- .../org/neo4j/server/BoltQueryLoggingIT.java | 4 +- .../LegacyIndexesUpgradeTest.java | 6 +- .../StoreUpgradeIntegrationTest.java | 4 +- .../desktop/config/portable/Template.java | 3 +- .../config/portable/VariableSubstitutor.java | 2 +- .../org/neo4j/desktop/model/DesktopModel.java | 2 +- .../UnsuitableDirectoryException.java | 2 +- .../java/org/neo4j/desktop/ui/Components.java | 3 +- .../desktop/ui/EditFileActionListener.java | 2 +- .../java/org/neo4j/desktop/ui/PlatformUI.java | 3 +- .../desktop/ui/ScrollableOptionPane.java | 9 +- .../org/neo4j/desktop/ui/SettingsDialog.java | 10 +- .../org/neo4j/desktop/ui/TeeOutputStream.java | 2 +- pom.xml | 2 +- .../java/org/neo4j/backup/BackupHelper.java | 2 +- .../checkpoint/workload/Workload.java | 10 +- .../tools/dump/InconsistencyReportReader.java | 4 +- .../neo4j/tools/rebuild/RebuildFromLogs.java | 2 +- .../tools/migration/StoreMigrationTest.java | 2 +- .../tools/rebuild/RebuildFromLogsTest.java | 4 +- .../neo4j/tools/txlog/CheckTxLogsTest.java | 5 +- 935 files changed, 3294 insertions(+), 3342 deletions(-) delete mode 100644 enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/MultiPaxosServerCluster.java delete mode 100644 enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterRandomTest.java diff --git a/build/checkstyle.xml b/build/checkstyle.xml index cc4494f81799c..15e4f991076c7 100644 --- a/build/checkstyle.xml +++ b/build/checkstyle.xml @@ -79,6 +79,11 @@ + + + + diff --git a/community/bolt/src/main/java/org/neo4j/bolt/security/ssl/Certificates.java b/community/bolt/src/main/java/org/neo4j/bolt/security/ssl/Certificates.java index 00cc87063587b..eedb422a7d36e 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/security/ssl/Certificates.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/security/ssl/Certificates.java @@ -88,7 +88,7 @@ public Certificates() random = useInsecureCertificateGeneration ? new InsecureRandom() : new SecureRandom(); } - public void createSelfSignedCertificate(File certificatePath, File privateKeyPath, String hostName) + public void createSelfSignedCertificate( File certificatePath, File privateKeyPath, String hostName ) throws GeneralSecurityException, IOException, OperatorCreationException { installCleanupHook(certificatePath, privateKeyPath); @@ -144,7 +144,7 @@ private static void installCleanupHook( final File certificatePath, final File p } ) ); } - public Certificate[] loadCertificates(File certFile) throws CertificateException, IOException + public Certificate[] loadCertificates( File certFile ) throws CertificateException, IOException { CertificateFactory certFactory = CertificateFactory.getInstance( CERTIFICATE_TYPE ); Collection certificates = new LinkedList<>(); @@ -170,7 +170,7 @@ public Certificate[] loadCertificates(File certFile) throws CertificateException return certificates.toArray( new Certificate[certificates.size()] ); } - public PrivateKey loadPrivateKey(File privateKeyFile) + public PrivateKey loadPrivateKey( File privateKeyFile ) throws IOException, NoSuchAlgorithmException, InvalidKeySpecException, NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltIOException.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltIOException.java index b1d5bf7547313..565e2432a8274 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltIOException.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltIOException.java @@ -29,13 +29,13 @@ public class BoltIOException extends IOException implements Status.HasStatus public BoltIOException( Status status, String message, Throwable cause ) { - super(message, cause); + super( message, cause ); this.status = status; } public BoltIOException( Status status, String message ) { - this(status, message, null); + this( status, message, null ); } @Override diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java index 42936264b2a8e..de2c39da2af80 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java @@ -81,7 +81,7 @@ public void onRun( String statement, Map params ) } @Override - public void onExternalError( Neo4jError error) + public void onExternalError( Neo4jError error ) { worker.enqueue( session -> session.externalError( error, defaultHandler ) ); } diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPack.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPack.java index 70fa3a4daca8c..269e861d90eb6 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPack.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPack.java @@ -95,7 +95,7 @@ else if ( obj instanceof String ) { pack( (String) obj ); } - else if (obj instanceof Character ) + else if ( obj instanceof Character ) { pack( (char) obj ); } @@ -218,10 +218,10 @@ else if ( obj instanceof Path ) { pathPacker.pack( this, (Path) obj ); } - else if ( obj instanceof Point) + else if ( obj instanceof Point ) { error = Optional.of(new Error( Status.Request.Invalid, - "Point is not yet supported as a return type in Bolt")); + "Point is not yet supported as a return type in Bolt" ) ); packNull(); } @@ -245,7 +245,7 @@ public void packRawMap( Map map ) throws IOException public void consumeError( ) throws BoltIOException { - if (error.isPresent()) + if ( error.isPresent() ) { Error e = error.get(); error = Optional.empty(); diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/packstream/utf8/SunMiscUTF8Encoder.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/packstream/utf8/SunMiscUTF8Encoder.java index 132adfc73b5f5..ffc10f47432df 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/v1/packstream/utf8/SunMiscUTF8Encoder.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/packstream/utf8/SunMiscUTF8Encoder.java @@ -131,11 +131,11 @@ private static MethodHandle charArrayGetter() try { Field value = String.class.getDeclaredField( "value" ); - if (value.getType() != char[].class) + if ( value.getType() != char[].class ) { throw new AssertionError( "This encoder depends being able to access raw char[] in java.lang.String, but the class is backed by a " + - value.getType().getCanonicalName()); + value.getType().getCanonicalName() ); } value.setAccessible( true ); return lookup.unreflectGetter( value ); diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/CypherAdapterStream.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/CypherAdapterStream.java index cd48d346254f4..e9addb5156a64 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/CypherAdapterStream.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/CypherAdapterStream.java @@ -121,7 +121,7 @@ private void addIfNonZero( Map map, String name, int count ) private String queryTypeCode( QueryExecutionType.QueryType queryType ) { - switch (queryType) + switch ( queryType ) { case READ_ONLY: return "r"; diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/Neo4jError.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/Neo4jError.java index 5b5082bedc1d3..83a0786c1b1ee 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/Neo4jError.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/Neo4jError.java @@ -48,12 +48,12 @@ private Neo4jError( Status status, String message, Throwable cause, boolean fata private Neo4jError( Status status, String message, boolean fatal ) { - this(status, message, null, fatal ); + this( status, message, null, fatal ); } private Neo4jError( Status status, Throwable cause, boolean fatal ) { - this(status, status.code().description(), cause, fatal ); + this( status, status.code().description(), cause, fatal ); } public Status status() @@ -194,7 +194,7 @@ public static Neo4jError combine( List errors ) { assert errors.size() >= 1; - if (errors.size() == 1) + if ( errors.size() == 1 ) { return errors.get( 0 ); } @@ -202,9 +202,10 @@ public static Neo4jError combine( List errors ) { Neo4jError first = errors.get( 0 ); Status combinedStatus = first.status; - StringBuilder combinedMessage = new StringBuilder( String.format("The following errors has occurred:%n%n" )); + StringBuilder combinedMessage = + new StringBuilder( String.format( "The following errors has occurred:%n%n" ) ); combinedMessage.append( first.message ); - for (int i = 1; i < errors.size(); i++) + for ( int i = 1; i < errors.size(); i++ ) { Neo4jError error = errors.get( i ); combinedStatus = error.status == combinedStatus ? error.status : Status.General.UnknownError; diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachine.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachine.java index 9579f12692d20..9759b55377787 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachine.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachine.java @@ -331,11 +331,11 @@ void terminateQueryAndRollbackTransaction( MutableTransactionState ctx ) throws * This is overly careful about always closing and nulling the transaction since * reset can cause ctx.currentTransaction to be null we store in local variable. */ - void closeTransaction(MutableTransactionState ctx, boolean success) throws TransactionFailureException + void closeTransaction( MutableTransactionState ctx, boolean success ) throws TransactionFailureException { KernelTransaction tx = ctx.currentTransaction; ctx.currentTransaction = null; - if (tx != null) + if ( tx != null ) { try { @@ -347,7 +347,7 @@ void closeTransaction(MutableTransactionState ctx, boolean success) throws Trans { tx.failure(); } - if (tx.isOpen()) + if ( tx.isOpen() ) { tx.close(); } diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/bookmarking/Bookmark.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/bookmarking/Bookmark.java index 638c734dba0a4..01e5425d08f36 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/bookmarking/Bookmark.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/bookmarking/Bookmark.java @@ -41,7 +41,7 @@ public String toString() return format( BOOKMARK_TX_PREFIX + "%d", txId ); } - public static Bookmark fromString( String bookmarkString) throws BookmarkFormatException + public static Bookmark fromString( String bookmarkString ) throws BookmarkFormatException { if ( bookmarkString != null && bookmarkString.startsWith( BOOKMARK_TX_PREFIX ) ) { diff --git a/community/bolt/src/test/java/org/neo4j/bolt/security/ssl/KeyStoreFactoryTest.java b/community/bolt/src/test/java/org/neo4j/bolt/security/ssl/KeyStoreFactoryTest.java index 227a963383efb..187badc88f7fa 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/security/ssl/KeyStoreFactoryTest.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/security/ssl/KeyStoreFactoryTest.java @@ -40,8 +40,8 @@ public class KeyStoreFactoryTest public void shouldCreateKeyStoreForGivenKeyPair() throws Exception { // given - File certificatePath = new File(dir.getRoot(), "cert" ); - File privateKeyPath = new File(dir.getRoot(), "key" ); + File certificatePath = new File( dir.getRoot(), "cert" ); + File privateKeyPath = new File( dir.getRoot(), "key" ); new Certificates().createSelfSignedCertificate( certificatePath, privateKeyPath, "some-hostname" ); @@ -56,8 +56,8 @@ public void shouldCreateKeyStoreForGivenKeyPair() throws Exception public void shouldImportSingleCertificateWhenNotInAChain() throws Exception { // given - File certificatePath = new File(dir.getRoot(), "cert" ); - File privateKeyPath = new File(dir.getRoot(),"key" ); + File certificatePath = new File( dir.getRoot(), "cert" ); + File privateKeyPath = new File( dir.getRoot(), "key" ); new Certificates().createSelfSignedCertificate( certificatePath, privateKeyPath, "some-hostname" ); diff --git a/community/bolt/src/test/java/org/neo4j/bolt/security/ssl/TestSslCertificateFactory.java b/community/bolt/src/test/java/org/neo4j/bolt/security/ssl/TestSslCertificateFactory.java index 3f7c0a1240ee9..aeac95dd1fa42 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/security/ssl/TestSslCertificateFactory.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/security/ssl/TestSslCertificateFactory.java @@ -50,8 +50,8 @@ public void shouldCreateASelfSignedCertificate() throws Exception { // Given Certificates sslFactory = new Certificates(); - File cPath = new File(tmpDir.getRoot(), "certificate" ); - File pkPath = new File(tmpDir.getRoot(), "key" ); + File cPath = new File( tmpDir.getRoot(), "certificate" ); + File pkPath = new File( tmpDir.getRoot(), "key" ); // When sslFactory.createSelfSignedCertificate( cPath, pkPath, "myhost" ); diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/message/InitMessage.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/message/InitMessage.java index c4dff96264757..23e5164f9650a 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/message/InitMessage.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/message/InitMessage.java @@ -19,10 +19,10 @@ */ package org.neo4j.bolt.v1.messaging.message; -import org.neo4j.bolt.v1.messaging.BoltRequestMessageHandler; - import java.util.Map; +import org.neo4j.bolt.v1.messaging.BoltRequestMessageHandler; + public class InitMessage implements RequestMessage { /** @@ -57,9 +57,13 @@ public void dispatch( BoltRequestMessageHandler consume public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } InitMessage that = (InitMessage) o; diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/util/MessageMatchers.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/util/MessageMatchers.java index 596d42efa3398..6c75d4e744eba 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/util/MessageMatchers.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/util/MessageMatchers.java @@ -92,7 +92,7 @@ public void describeTo( Description description ) }; } - public static Matcher hasNotification( Notification notification) + public static Matcher hasNotification( Notification notification ) { return new TypeSafeMatcher() { @@ -247,7 +247,7 @@ public static byte[] serialize( RequestMessage... messages ) throws IOException { final RecordingByteChannel rawData = new RecordingByteChannel(); final BoltRequestMessageWriter packer = new BoltRequestMessageWriter( new Neo4jPack.Packer( new - BufferedChannelOutput( rawData )), NO_BOUNDARY_HOOK ); + BufferedChannelOutput( rawData ) ), NO_BOUNDARY_HOOK ); for ( RequestMessage message : messages ) { @@ -262,7 +262,7 @@ public static byte[] serialize( ResponseMessage... messages ) throws IOException { final RecordingByteChannel rawData = new RecordingByteChannel(); final BoltResponseMessageWriter packer = new BoltResponseMessageWriter( new Neo4jPack.Packer( new - BufferedChannelOutput( rawData )), NO_BOUNDARY_HOOK ); + BufferedChannelOutput( rawData ) ), NO_BOUNDARY_HOOK ); for ( ResponseMessage message : messages ) { diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/packstream/BufferedChannelInput.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/packstream/BufferedChannelInput.java index e7ba9d91c1914..ecce61e8509da 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/packstream/BufferedChannelInput.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/packstream/BufferedChannelInput.java @@ -118,7 +118,7 @@ public double readDouble() throws IOException public PackInput readBytes( byte[] into, int index, int toRead ) throws IOException { int endIndex = index + toRead; - while ( index < endIndex) + while ( index < endIndex ) { toRead = Math.min( buffer.remaining(), endIndex - index ); buffer.get( into, index, toRead ); diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/packstream/PackStreamTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/packstream/PackStreamTest.java index 03c5ebe0d0a29..308b680c75104 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/packstream/PackStreamTest.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/packstream/PackStreamTest.java @@ -786,7 +786,7 @@ private void doTheThing( PackStream.Packer packer, Object value ) throws IOExcep { packer.pack( (String) value ); } - else if ( value instanceof Long || value instanceof Integer) + else if ( value instanceof Long || value instanceof Integer ) { packer.pack( ((Number) value).longValue() ); } diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConfigIT.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConfigIT.java index 5eff90ca58218..072b222cc075b 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConfigIT.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConfigIT.java @@ -47,13 +47,13 @@ public class BoltConfigIT public Neo4jWithSocket server = new Neo4jWithSocket( getClass(), settings -> { - settings.put( new BoltConnector("bolt").type.name(), "BOLT" ); - settings.put( new BoltConnector("bolt").enabled.name(), "true" ); - settings.put( new BoltConnector("bolt").address.name(), "localhost:7888" ); - settings.put( new BoltConnector("1").type.name(), "BOLT" ); - settings.put( new BoltConnector("1").enabled.name(), "true" ); - settings.put( new BoltConnector("1").address.name(), "localhost:7687" ); - settings.put( new BoltConnector("1").encryption_level.name(), REQUIRED.name() ); + settings.put( new BoltConnector( "bolt" ).type.name(), "BOLT" ); + settings.put( new BoltConnector( "bolt" ).enabled.name(), "true" ); + settings.put( new BoltConnector( "bolt" ).address.name(), "localhost:7888" ); + settings.put( new BoltConnector( "1" ).type.name(), "BOLT" ); + settings.put( new BoltConnector( "1" ).enabled.name(), "true" ); + settings.put( new BoltConnector( "1" ).address.name(), "localhost:7687" ); + settings.put( new BoltConnector( "1" ).encryption_level.name(), REQUIRED.name() ); } ); @Rule public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/ConnectionIT.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/ConnectionIT.java index 43f3f051f9231..2eb2195c94e03 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/ConnectionIT.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/ConnectionIT.java @@ -38,7 +38,7 @@ import static java.util.Arrays.asList; -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class ConnectionIT { @Rule @@ -47,10 +47,10 @@ public class ConnectionIT @Rule public Neo4jWithSocket server = new Neo4jWithSocket( getClass() ); - @Parameterized.Parameter(0) + @Parameterized.Parameter( 0 ) public TransportConnection connection; - @Parameterized.Parameter(1) + @Parameterized.Parameter( 1 ) public HostnamePort address; @Parameterized.Parameters diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/Neo4jWithSocket.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/Neo4jWithSocket.java index fc17477960ad2..dc36cb2baaa75 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/Neo4jWithSocket.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/Neo4jWithSocket.java @@ -19,6 +19,10 @@ */ package org.neo4j.bolt.v1.transport.integration; +import org.junit.rules.ExternalResource; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + import java.io.File; import java.io.IOException; import java.util.HashMap; @@ -26,10 +30,6 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import org.junit.rules.ExternalResource; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - import org.neo4j.bolt.BoltKernelExtension; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; @@ -110,7 +110,7 @@ public void shutdownDatabase() { try { - if ( gdb != null) + if ( gdb != null ) { gdb.shutdown(); } diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/TestNotification.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/TestNotification.java index 1aece7e5778b1..9c301cb8e7a7a 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/TestNotification.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/TestNotification.java @@ -47,14 +47,14 @@ public TestNotification( String code, String title, String description, Severity } @SuppressWarnings( "unchecked" ) - public static Notification fromMap(Map notification) + public static Notification fromMap( Map notification ) { assertThat(notification, hasKey("code")); assertThat(notification, hasKey("title")); assertThat(notification, hasKey("description")); assertThat(notification, hasKey("severity")); InputPosition position = null; - if (notification.containsKey( "position" )) + if ( notification.containsKey( "position" ) ) { Map pos = (Map) notification.get( "position" ); assertThat( pos, hasKey( "offset" ) ); @@ -103,20 +103,32 @@ public InputPosition getPosition() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } TestNotification that = (TestNotification) o; if ( code != null ? !code.equals( that.code ) : that.code != null ) - { return false; } + { + return false; + } if ( title != null ? !title.equals( that.title ) : that.title != null ) - { return false; } + { + return false; + } if ( description != null ? !description.equals( that.description ) : that.description != null ) - { return false; } + { + return false; + } if ( severityLevel != that.severityLevel ) - { return false; } + { + return false; + } return position != null ? position.equals( that.position ) : that.position == null; } diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/TransportErrorIT.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/TransportErrorIT.java index b819b97a13842..5e32e84a36604 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/TransportErrorIT.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/TransportErrorIT.java @@ -51,10 +51,10 @@ public class TransportErrorIT @Rule public Neo4jWithSocket server = new Neo4jWithSocket( getClass() ); - @Parameterized.Parameter(0) + @Parameterized.Parameter( 0 ) public Factory cf; - @Parameterized.Parameter(1) + @Parameterized.Parameter( 1 ) public HostnamePort address; private TransportConnection client; diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/client/SocketConnection.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/client/SocketConnection.java index d1ce570cfdfe6..412678cb6a7a5 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/client/SocketConnection.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/client/SocketConnection.java @@ -37,7 +37,7 @@ public class SocketConnection implements TransportConnection public SocketConnection() { - this(new Socket()); + this( new Socket() ); } public SocketConnection( Socket socket ) @@ -86,7 +86,7 @@ public byte[] recv( int length ) throws IOException throw new SocketTimeoutException( "Reading data timed out, missing " + left + " bytes. Buffer: " + HexPrinter.hex( bytes ) ); } //all the bytes could not be read, fail - if (left != 0) + if ( left != 0 ) { throw new IOException( "Failed to read " + length + " bytes, missing " + left + " bytes. Buffer: " + HexPrinter.hex( bytes ) ); } diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/client/WebSocketConnection.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/client/WebSocketConnection.java index 5875f1024d5dc..f669f03d9caeb 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/client/WebSocketConnection.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/client/WebSocketConnection.java @@ -150,7 +150,7 @@ private void waitForReceivedData( int length, int remaining, byte[] target ) @Override public void disconnect() throws IOException { - if (client != null) + if ( client != null ) { try { diff --git a/community/codegen/src/main/java/org/neo4j/codegen/ByteCodeUtils.java b/community/codegen/src/main/java/org/neo4j/codegen/ByteCodeUtils.java index ad79509877db6..cbc9f75461e03 100644 --- a/community/codegen/src/main/java/org/neo4j/codegen/ByteCodeUtils.java +++ b/community/codegen/src/main/java/org/neo4j/codegen/ByteCodeUtils.java @@ -45,7 +45,7 @@ public static String byteCodeName( TypeReference reference ) public static String outerName( TypeReference reference ) { - if (!reference.isInnerClass()) + if ( !reference.isInnerClass() ) { return null; } @@ -73,7 +73,7 @@ public static String desc( MethodDeclaration declaration ) return internalDesc( declaration.erased(), false ); } - public static String desc( MethodReference reference) + public static String desc( MethodReference reference ) { StringBuilder builder = new StringBuilder( ); builder.append( "(" ); @@ -110,7 +110,7 @@ public static String[] exceptions( MethodDeclaration declaration ) { List throwsList = declaration.erased().throwsList(); - if (throwsList.isEmpty()) + if ( throwsList.isEmpty() ) { return null; } diff --git a/community/codegen/src/main/java/org/neo4j/codegen/ClassGenerator.java b/community/codegen/src/main/java/org/neo4j/codegen/ClassGenerator.java index 8292d3871896f..0f4ea35f63b4f 100644 --- a/community/codegen/src/main/java/org/neo4j/codegen/ClassGenerator.java +++ b/community/codegen/src/main/java/org/neo4j/codegen/ClassGenerator.java @@ -47,7 +47,7 @@ public class ClassGenerator implements AutoCloseable @Override public void close() { - if (!hasConstructor) + if ( !hasConstructor ) { generate( MethodTemplate.constructor().invokeSuper().build() ); } @@ -148,7 +148,7 @@ public CodeBlock generate( MethodDeclaration.Builder builder ) private CodeBlock generate( MethodDeclaration declaration ) { - if (declaration.isConstructor()) + if ( declaration.isConstructor() ) { hasConstructor = true; } diff --git a/community/codegen/src/main/java/org/neo4j/codegen/ClassHandle.java b/community/codegen/src/main/java/org/neo4j/codegen/ClassHandle.java index 28fb24e6b5315..ddc10ebc480df 100644 --- a/community/codegen/src/main/java/org/neo4j/codegen/ClassHandle.java +++ b/community/codegen/src/main/java/org/neo4j/codegen/ClassHandle.java @@ -29,7 +29,7 @@ public class ClassHandle extends TypeReference ClassHandle( String packageName, String name, TypeReference parent, CodeGenerator generator, long generation ) { - super(packageName, name, parent.isPrimitive(), parent.isArray(), false, "", Modifier.PUBLIC); + super( packageName, name, parent.isPrimitive(), parent.isArray(), false, "", Modifier.PUBLIC ); this.parent = parent; this.generator = generator; this.generation = generation; diff --git a/community/codegen/src/main/java/org/neo4j/codegen/ExpressionTemplate.java b/community/codegen/src/main/java/org/neo4j/codegen/ExpressionTemplate.java index bf22fc9bbd3ef..48db863a4314e 100644 --- a/community/codegen/src/main/java/org/neo4j/codegen/ExpressionTemplate.java +++ b/community/codegen/src/main/java/org/neo4j/codegen/ExpressionTemplate.java @@ -162,7 +162,7 @@ void templateAccept( CodeBlock method, ExpressionVisitor visitor ) }; } - Expression materialize( final CodeBlock method) + Expression materialize( final CodeBlock method ) { return new Expression( type ) { diff --git a/community/codegen/src/main/java/org/neo4j/codegen/ExpressionVisitor.java b/community/codegen/src/main/java/org/neo4j/codegen/ExpressionVisitor.java index 1e5757809468c..40399192990be 100644 --- a/community/codegen/src/main/java/org/neo4j/codegen/ExpressionVisitor.java +++ b/community/codegen/src/main/java/org/neo4j/codegen/ExpressionVisitor.java @@ -41,7 +41,7 @@ public interface ExpressionVisitor void ternary( Expression test, Expression onTrue, Expression onFalse ); - void equal( Expression lhs, Expression rhs); + void equal( Expression lhs, Expression rhs ); void notEqual( Expression lhs, Expression rhs ); diff --git a/community/codegen/src/main/java/org/neo4j/codegen/LocalVariables.java b/community/codegen/src/main/java/org/neo4j/codegen/LocalVariables.java index 62a479e77fabe..364f00a6d47b0 100644 --- a/community/codegen/src/main/java/org/neo4j/codegen/LocalVariables.java +++ b/community/codegen/src/main/java/org/neo4j/codegen/LocalVariables.java @@ -37,7 +37,7 @@ public LocalVariable createNew( TypeReference type, String name ) LocalVariable localVariable = new LocalVariable( type, name, counter.getAndIncrement() ); localVariables.put( name, localVariable ); //if 64 bit types we need to give it one more index - if (type.simpleName().equals( "double" ) || type.simpleName().equals( "long" )) + if ( type.simpleName().equals( "double" ) || type.simpleName().equals( "long" ) ) { counter.incrementAndGet(); } @@ -47,7 +47,7 @@ public LocalVariable createNew( TypeReference type, String name ) public LocalVariable get( String name ) { LocalVariable localVariable = localVariables.get( name ); - if (localVariable == null) + if ( localVariable == null ) { throw new NoSuchElementException( "No variable " + name + " in scope" ); } diff --git a/community/codegen/src/main/java/org/neo4j/codegen/MethodEmitter.java b/community/codegen/src/main/java/org/neo4j/codegen/MethodEmitter.java index ea001b707d780..11a4015e3ff54 100644 --- a/community/codegen/src/main/java/org/neo4j/codegen/MethodEmitter.java +++ b/community/codegen/src/main/java/org/neo4j/codegen/MethodEmitter.java @@ -43,7 +43,7 @@ public interface MethodEmitter void endBlock(); - void tryCatchBlock( Consumer body, Consumer handler, LocalVariable exception, T block); + void tryCatchBlock( Consumer body, Consumer handler, LocalVariable exception, T block ); void throwException( Expression exception ); diff --git a/community/codegen/src/main/java/org/neo4j/codegen/MethodReference.java b/community/codegen/src/main/java/org/neo4j/codegen/MethodReference.java index 7141b7e12ee8d..712b3f01cef35 100644 --- a/community/codegen/src/main/java/org/neo4j/codegen/MethodReference.java +++ b/community/codegen/src/main/java/org/neo4j/codegen/MethodReference.java @@ -36,7 +36,7 @@ public static MethodReference methodReference( Class owner, Class returns, } catch ( NoSuchMethodException e ) { - throw new IllegalArgumentException("No method with name " + name, e); + throw new IllegalArgumentException( "No method with name " + name, e ); } } @@ -51,7 +51,7 @@ public static MethodReference methodReference( Class owner, TypeReference ret } catch ( NoSuchMethodException e ) { - throw new IllegalArgumentException("No method with name " + name, e); + throw new IllegalArgumentException( "No method with name " + name, e ); } } @@ -95,7 +95,8 @@ public static MethodReference constructorReference( TypeReference owner, TypeRef private final TypeReference[] parameters; private final int modifiers; - MethodReference( TypeReference owner, String name, TypeReference returns, int modifiers, TypeReference[] parameters) + MethodReference( TypeReference owner, String name, TypeReference returns, int modifiers, + TypeReference[] parameters ) { this.owner = owner; diff --git a/community/codegen/src/main/java/org/neo4j/codegen/MethodTemplate.java b/community/codegen/src/main/java/org/neo4j/codegen/MethodTemplate.java index c7325d7791990..959a397e1be97 100644 --- a/community/codegen/src/main/java/org/neo4j/codegen/MethodTemplate.java +++ b/community/codegen/src/main/java/org/neo4j/codegen/MethodTemplate.java @@ -87,7 +87,7 @@ public Builder invokeSuper() ExpressionTemplate.invokeSuperConstructor( new ExpressionTemplate[]{}, TypeReference.NO_TYPES ) ); } - public Builder invokeSuper( ExpressionTemplate[] parameters, Class[] parameterTypes) + public Builder invokeSuper( ExpressionTemplate[] parameters, Class[] parameterTypes ) { TypeReference[] references = new TypeReference[parameterTypes.length]; for ( int i = 0; i < parameterTypes.length; i++ ) @@ -98,7 +98,7 @@ public Builder invokeSuper( ExpressionTemplate[] parameters, Class[] paramete return invokeSuper( parameters, references ); } - public Builder invokeSuper( ExpressionTemplate[] parameters, TypeReference[] parameterTypes) + public Builder invokeSuper( ExpressionTemplate[] parameters, TypeReference[] parameterTypes ) { return expression( ExpressionTemplate.invokeSuperConstructor( parameters, parameterTypes ) ); } @@ -164,7 +164,7 @@ public Builder put( ExpressionTemplate target, TypeReference fieldType, String f return this; } - public Builder modiferes(int modifiers) + public Builder modiferes( int modifiers ) { this.modifiers = modifiers; return this; diff --git a/community/codegen/src/main/java/org/neo4j/codegen/TypeReference.java b/community/codegen/src/main/java/org/neo4j/codegen/TypeReference.java index d17286b1bd3e8..e92d940a94826 100644 --- a/community/codegen/src/main/java/org/neo4j/codegen/TypeReference.java +++ b/community/codegen/src/main/java/org/neo4j/codegen/TypeReference.java @@ -65,7 +65,7 @@ public static TypeReference typeReference( Class type ) Class innerType = type.isArray() ? type.getComponentType() : type; - if (innerType.isPrimitive()) + if ( innerType.isPrimitive() ) { name = innerType.getName(); switch ( name ) @@ -87,7 +87,7 @@ public static TypeReference typeReference( Class type ) packageName = innerType.getPackage().getName(); String canonicalName = innerType.getCanonicalName(); Class declaringClass = innerType.getDeclaringClass(); - if ( declaringClass != null) + if ( declaringClass != null ) { declaringClassName = declaringClass.getSimpleName(); name = canonicalName.substring( packageName.length() + declaringClassName.length() + 2 ); @@ -252,27 +252,45 @@ public int modifiers() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } TypeReference reference = (TypeReference) o; if ( isPrimitive != reference.isPrimitive ) - { return false; } + { + return false; + } if ( isArray != reference.isArray ) - { return false; } + { + return false; + } if ( isTypeParameter != reference.isTypeParameter ) - { return false; } + { + return false; + } if ( modifiers != reference.modifiers ) - { return false; } + { + return false; + } if ( packageName != null ? !packageName.equals( reference.packageName ) : reference.packageName != null ) - { return false; } + { + return false; + } if ( name != null ? !name.equals( reference.name ) : reference.name != null ) - { return false; } + { + return false; + } // Probably incorrect - comparing Object[] arrays with Arrays.equals if ( !Arrays.equals( parameters, reference.parameters ) ) - { return false; } + { + return false; + } return declaringClassName != null ? declaringClassName.equals( reference.declaringClassName ) : reference.declaringClassName == null; diff --git a/community/codegen/src/main/java/org/neo4j/codegen/source/MethodSourceWriter.java b/community/codegen/src/main/java/org/neo4j/codegen/source/MethodSourceWriter.java index 3d38bf747b1b9..573b5191286f5 100644 --- a/community/codegen/src/main/java/org/neo4j/codegen/source/MethodSourceWriter.java +++ b/community/codegen/src/main/java/org/neo4j/codegen/source/MethodSourceWriter.java @@ -162,7 +162,7 @@ public void beginBlock() } @Override - public void tryCatchBlock( Consumer body, Consumer handler, LocalVariable exception, T block) + public void tryCatchBlock( Consumer body, Consumer handler, LocalVariable exception, T block ) { indent().append( "try\n" ); @@ -468,7 +468,7 @@ public void unbox( Expression expression ) expression.accept( this ); } - private void binaryOperation(Expression lhs, Expression rhs, String operator) + private void binaryOperation( Expression lhs, Expression rhs, String operator ) { lhs.accept( this ); append( operator ); diff --git a/community/codegen/src/test/java/org/neo4j/codegen/ByteCodeUtilsTest.java b/community/codegen/src/test/java/org/neo4j/codegen/ByteCodeUtilsTest.java index 4c494ef104d1f..5519012ebc040 100644 --- a/community/codegen/src/test/java/org/neo4j/codegen/ByteCodeUtilsTest.java +++ b/community/codegen/src/test/java/org/neo4j/codegen/ByteCodeUtilsTest.java @@ -193,7 +193,7 @@ public void shouldHandleGenericThrows() assertThat( exceptions, equalTo(new String[]{"java/lang/Exception"} )); } - private void assertTypeName(Class type, String expected) + private void assertTypeName( Class type, String expected ) { // GIVEN TypeReference reference = typeReference( type ); diff --git a/community/codegen/src/test/java/org/neo4j/codegen/CodeGenerationTest.java b/community/codegen/src/test/java/org/neo4j/codegen/CodeGenerationTest.java index f6bf4c3ab1e73..981003fa2c8f9 100644 --- a/community/codegen/src/test/java/org/neo4j/codegen/CodeGenerationTest.java +++ b/community/codegen/src/test/java/org/neo4j/codegen/CodeGenerationTest.java @@ -1703,7 +1703,7 @@ public void shouldBeAbleToUnbox() throws Throwable assertThat( unboxTest( Character.class, char.class, 'a' ), equalTo( 'a' ) ); } - private Object unboxTest(Class boxedType, Class unboxedType, T value) + private Object unboxTest( Class boxedType, Class unboxedType, T value ) throws Throwable { createGenerator(); @@ -1724,7 +1724,7 @@ private Object unboxTest(Class boxedType, Class unboxedType, T value) return instanceMethod( handle.newInstance(), "unbox", boxedType ).invoke( value ); } - private Object boxTest(Class unboxedType, T value) + private Object boxTest( Class unboxedType, T value ) throws Throwable { createGenerator(); @@ -1745,7 +1745,7 @@ private Object boxTest(Class unboxedType, T value) return instanceMethod( handle.newInstance(), "box", unboxedType ).invoke( value ); } - private MethodHandle conditional(Function test, Parameter... params) + private MethodHandle conditional( Function test, Parameter... params ) { throw new UnsupportedOperationException( "not implemented" ); } diff --git a/community/collections/src/main/java/org/neo4j/helpers/collection/Iterables.java b/community/collections/src/main/java/org/neo4j/helpers/collection/Iterables.java index 6112562a0b4b8..368515cc952f3 100644 --- a/community/collections/src/main/java/org/neo4j/helpers/collection/Iterables.java +++ b/community/collections/src/main/java/org/neo4j/helpers/collection/Iterables.java @@ -46,7 +46,7 @@ public final class Iterables { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static Iterable empty() { return EMPTY; @@ -139,18 +139,18 @@ public static > C addAll( C collection, Iterable iterator = iterable.iterator(); try { - while (iterator.hasNext()) + while ( iterator.hasNext() ) { collection.add( iterator.next() ); } } finally { - if (iterator instanceof AutoCloseable) + if ( iterator instanceof AutoCloseable ) { try { - ((AutoCloseable)iterator).close(); + ((AutoCloseable) iterator).close(); } catch ( Exception e ) { @@ -281,20 +281,20 @@ public static Iterable flatMap( Function Iterable iterable( C... items ) { - return (Iterable) Arrays.asList(items); + return (Iterable) Arrays.asList( items ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static Iterable cast( Iterable iterable ) { return (Iterable) iterable; } @SafeVarargs - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static Iterable concat( Iterable... iterables ) { return concat( Arrays.asList( (Iterable[]) iterables ) ); @@ -402,7 +402,7 @@ public static Object[] asArray( Iterable iterable ) return asArray( Object.class, iterable ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static T[] asArray( Class componentType, Iterable iterable ) { if ( iterable == null ) @@ -725,8 +725,7 @@ public boolean hasNext() } } - while ( !currentIterator.hasNext() && - iterator.hasNext() ) + while ( !currentIterator.hasNext() && iterator.hasNext() ) { currentIterator = iterator.next().iterator(); } diff --git a/community/collections/src/main/java/org/neo4j/helpers/collection/Iterators.java b/community/collections/src/main/java/org/neo4j/helpers/collection/Iterators.java index fbb61f1d4e1e7..75316edf07d29 100644 --- a/community/collections/src/main/java/org/neo4j/helpers/collection/Iterators.java +++ b/community/collections/src/main/java/org/neo4j/helpers/collection/Iterators.java @@ -421,7 +421,7 @@ public static Set asSet( T... items ) return new HashSet<>( Arrays.asList( items ) ); } - public static Set emptySetOf( @SuppressWarnings("unused"/*just used as a type marker*/) Class type ) + public static Set emptySetOf( @SuppressWarnings( "unused"/*just used as a type marker*/ ) Class type ) { return Collections.emptySet(); } @@ -434,9 +434,9 @@ public static Set emptySetOf( @SuppressWarnings("unused"/*just used as a * @return the {@link Set} containing the items. */ @SafeVarargs - public static Set set( T... items) + public static Set set( T... items ) { - return asSet(items); + return asSet( items ); } /** @@ -716,7 +716,7 @@ public static Iterator flatMap( Function Iterator concat( Iterator... iterators ) { return concat( Arrays.asList( (Iterator[]) iterators ).iterator() ); @@ -724,12 +724,12 @@ public static Iterator concat( Iterator... iterators ) public static ResourceIterator concatResourceIterators( Iterator> iterators ) { - return new CombiningResourceIterator<>(iterators); + return new CombiningResourceIterator<>( iterators ); } public static Iterator concat( Iterator> iterators ) { - return new CombiningIterator<>(iterators); + return new CombiningIterator<>( iterators ); } public static ResourceIterable asResourceIterable( final ResourceIterator it ) diff --git a/community/collections/src/main/java/org/neo4j/helpers/collection/MapUtil.java b/community/collections/src/main/java/org/neo4j/helpers/collection/MapUtil.java index 65d3ae620fd05..95b55b4adb197 100644 --- a/community/collections/src/main/java/org/neo4j/helpers/collection/MapUtil.java +++ b/community/collections/src/main/java/org/neo4j/helpers/collection/MapUtil.java @@ -67,8 +67,8 @@ public static Map genericMap( Object... objects ) * @param type of values * @return a Map with the entries supplied by {@code objects}. */ - @SuppressWarnings("unchecked") - public static Map genericMap( Map targetMap, Object... objects ) + @SuppressWarnings( "unchecked" ) + public static Map genericMap( Map targetMap, Object... objects ) { int i = 0; while ( i < objects.length ) @@ -375,16 +375,16 @@ public static Map reverse( Map map ) return reversedMap; } - public static Map copyAndPut(Map map, K key, V value) + public static Map copyAndPut( Map map, K key, V value ) { - Map copy = new HashMap<>( map ); - copy.put( key, value); + Map copy = new HashMap<>( map ); + copy.put( key, value ); return copy; } - public static Map copyAndRemove(Map map, K key) + public static Map copyAndRemove( Map map, K key ) { - Map copy = new HashMap<>( map ); + Map copy = new HashMap<>( map ); copy.remove( key ); return copy; } @@ -405,30 +405,6 @@ public static Map toMap( Iterator> pairs ) return result; } - public static boolean approximatelyEqual( Map that, Map other, double tolerance) - { - if ( that.size() != other.size() ) - { - return false; - } - - for ( Map.Entry entry : that.entrySet() ) - { - if ( !other.containsKey( entry.getKey() ) ) - { - return false; - } - - double otherValue = other.get( entry.getKey() ); - if ( Math.abs( otherValue - entry.getValue() ) > tolerance) - { - return false; - } - } - - return true; - } - public static MapBuilder entry( K key, V value ) { return new MapBuilder().entry( key, value ); diff --git a/community/collections/src/main/java/org/neo4j/helpers/collection/ResourceClosingIterator.java b/community/collections/src/main/java/org/neo4j/helpers/collection/ResourceClosingIterator.java index 2f5503a0607e4..640a8361ac3c8 100644 --- a/community/collections/src/main/java/org/neo4j/helpers/collection/ResourceClosingIterator.java +++ b/community/collections/src/main/java/org/neo4j/helpers/collection/ResourceClosingIterator.java @@ -66,7 +66,7 @@ public boolean hasNext() return hasNext; } - public abstract V map(T elem); + public abstract V map( T elem ); @Override public V next() diff --git a/community/collections/src/main/java/org/neo4j/helpers/collection/Visitor.java b/community/collections/src/main/java/org/neo4j/helpers/collection/Visitor.java index 8766a811f10ab..57b8b76a157f0 100644 --- a/community/collections/src/main/java/org/neo4j/helpers/collection/Visitor.java +++ b/community/collections/src/main/java/org/neo4j/helpers/collection/Visitor.java @@ -60,7 +60,7 @@ final class SafeGenerics * @param type of the exception * @return the visitor cast to compatible type parameters or {@code null} */ - @SuppressWarnings("unchecked"/*checked through reflection*/) + @SuppressWarnings( "unchecked"/*checked through reflection*/ ) public static Visitor castOrNull( Class eType, Class fType, Object visitor ) { diff --git a/community/collections/src/test/java/org/neo4j/helpers/collection/LruCacheTest.java b/community/collections/src/test/java/org/neo4j/helpers/collection/LruCacheTest.java index 08972269eab76..cc4b99227a503 100644 --- a/community/collections/src/test/java/org/neo4j/helpers/collection/LruCacheTest.java +++ b/community/collections/src/test/java/org/neo4j/helpers/collection/LruCacheTest.java @@ -19,42 +19,42 @@ */ package org.neo4j.helpers.collection; +import org.junit.Test; + import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class LruCacheTest { - @Test(expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void shouldThrowWhenMaxSizeIsNotGreaterThanZero() { new LruCache<>( "TestCache", 0 ); } - @Test(expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void shouldThrowWhenPuttingEntryWithNullKey() { new LruCache<>( "TestCache", 70 ).put( null, new Object() ); } - @Test(expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void shouldThrowWhenPuttingEntryWithNullValue() { new LruCache<>( "TestCache", 70 ).put( new Object(), null ); } - @Test(expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void shouldThrowWhenGettingWithANullKey() { new LruCache<>( "TestCache", 70 ).get( null ); } - @Test(expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void shouldThrowWhenRemovingWithANullKey() { new LruCache<>( "TestCache", 70 ).remove( null ); diff --git a/community/command-line/src/test/java/org/neo4j/commandline/arguments/ArgumentsTest.java b/community/command-line/src/test/java/org/neo4j/commandline/arguments/ArgumentsTest.java index 2495d475e4e56..e93984e226de5 100644 --- a/community/command-line/src/test/java/org/neo4j/commandline/arguments/ArgumentsTest.java +++ b/community/command-line/src/test/java/org/neo4j/commandline/arguments/ArgumentsTest.java @@ -202,7 +202,7 @@ public void longNamesTriggerNewLineFormatting() throws Exception .withArgument( new MandatoryNamedArg( "loooooooooooooong-variable-name", "loooooooooooooong-variable-value", "This is also a long string which should be printed on a new line because of long " + - "names.") ) + "names." ) ) .description( "How to use" ) ); } diff --git a/community/common/src/main/java/org/neo4j/function/Predicates.java b/community/common/src/main/java/org/neo4j/function/Predicates.java index c748df3b40f26..2e0b84787ab3b 100644 --- a/community/common/src/main/java/org/neo4j/function/Predicates.java +++ b/community/common/src/main/java/org/neo4j/function/Predicates.java @@ -247,7 +247,7 @@ public static Predicate in( final T... allowed ) public static Predicate not( Predicate predicate ) { - return (t) -> !predicate.test( t ); + return ( t ) -> !predicate.test( t ); } public static Predicate in( final Iterable allowed ) diff --git a/community/common/src/main/java/org/neo4j/kernel/api/exceptions/Status.java b/community/common/src/main/java/org/neo4j/kernel/api/exceptions/Status.java index e1edb163123b4..a6688d078925a 100644 --- a/community/common/src/main/java/org/neo4j/kernel/api/exceptions/Status.java +++ b/community/common/src/main/java/org/neo4j/kernel/api/exceptions/Status.java @@ -168,7 +168,7 @@ enum Transaction implements Status DeadlockDetected( TransientError, "This transaction, and at least one more transaction, has acquired locks in a way that it will wait " + "indefinitely, and the database has aborted it. Retrying this transaction will most likely be " + - "successful."), + "successful." ), InstanceStateChanged( TransientError, "Transactions rely on assumptions around the state of the Neo4j instance they " + "execute on. For instance, transactions in a cluster may expect that " + @@ -176,7 +176,7 @@ enum Transaction implements Status "instances may change state while the transaction is running. This causes " + "assumptions the instance has made about how to execute the transaction " + "to be violated - meaning the transaction must be rolled " + - "back. If you see this error, you should retry your operation in a new transaction."), + "back. If you see this error, you should retry your operation in a new transaction." ), ConstraintsChanged( TransientError, "Database constraints changed since the start of this transaction" ), Outdated( TransientError, @@ -221,12 +221,12 @@ enum Statement implements Status PropertyNotFound( ClientError, "The statement refers to a non-existent property." ), LabelNotFound( ClientError, - "The statement is referring to a label that does not exist."), + "The statement is referring to a label that does not exist." ), TypeError( ClientError, "The statement is attempting to perform operations on values with types that are not supported by " + "the operation." ), ArgumentError( ClientError, - "The statement is attempting to perform operations using invalid arguments"), + "The statement is attempting to perform operations using invalid arguments" ), ArithmeticError( ClientError, "Invalid use of arithmetic, such as dividing by zero." ), @@ -236,16 +236,16 @@ enum Statement implements Status // transient errors ExternalResourceFailed( ClientError, - "Access to an external resource failed"), + "Access to an external resource failed" ), // client notifications (performance) CartesianProductWarning( ClientNotification, "This query builds a cartesian product between disconnected patterns." ), DynamicPropertyWarning( ClientNotification, "Queries using dynamic properties will use neither index seeks nor index scans for those properties" ), - EagerOperatorWarning(ClientNotification, + EagerOperatorWarning( ClientNotification, "The execution plan for this query contains the Eager operator, which forces all dependent data to " + - "be materialized in main memory before proceeding"), + "be materialized in main memory before proceeding" ), JoinHintUnfulfillableWarning( ClientNotification, "The database was unable to plan a hinted join." ), NoApplicableIndexWarning( ClientNotification, @@ -327,7 +327,7 @@ enum Schema implements Status ConstraintDropFailed( DatabaseError, "The database failed to drop a requested constraint." ), IndexCreationFailed( DatabaseError, - "Failed to create an index."), + "Failed to create an index." ), IndexDropFailed( DatabaseError, "The database failed to drop a requested index." ), LabelAccessFailed( DatabaseError, @@ -529,7 +529,7 @@ public static Collection all() { if ( child.isEnum() && Status.class.isAssignableFrom( child ) ) { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Class statusType = (Class) child; Collections.addAll( result, statusType.getEnumConstants() ); } @@ -611,14 +611,14 @@ enum Classification { /** The Client sent a bad request - changing the request might yield a successful outcome. */ ClientError( TransactionEffect.ROLLBACK, - "The Client sent a bad request - changing the request might yield a successful outcome."), + "The Client sent a bad request - changing the request might yield a successful outcome." ), /** There are notifications about the request sent by the client.*/ ClientNotification( TransactionEffect.NONE, "There are notifications about the request sent by the client." ), /** The database cannot service the request right now, retrying later might yield a successful outcome. */ TransientError( TransactionEffect.ROLLBACK, - "The database cannot service the request right now, retrying later might yield a successful outcome. "), + "The database cannot service the request right now, retrying later might yield a successful outcome. " ), // Implementation note: These are a sharp tool, database error signals // that something is *seriously* wrong, and will prompt the user to send diff --git a/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifeSupport.java b/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifeSupport.java index 9045a6bbb4439..70a4a47e98ff8 100644 --- a/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifeSupport.java +++ b/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifeSupport.java @@ -140,7 +140,7 @@ public synchronized void stop() if ( status == LifecycleStatus.STARTED ) { status = changedStatus( this, status, LifecycleStatus.STOPPING ); - LifecycleException ex = stopInstances(instances); + LifecycleException ex = stopInstances( instances ); status = changedStatus( this, status, LifecycleStatus.STOPPED ); if ( ex != null ) @@ -150,7 +150,7 @@ public synchronized void stop() } } - private LifecycleException stopInstances(List instances) + private LifecycleException stopInstances( List instances ) { LifecycleException ex = null; for ( int i = instances.size() - 1; i >= 0; i-- ) @@ -279,7 +279,7 @@ public synchronized boolean remove( Lifecycle instance ) public Iterable getLifecycleInstances() { - return instances.stream().map( (l) -> l.instance ).collect( toList() ); + return instances.stream().map( ( l ) -> l.instance ).collect( toList() ); } /** @@ -344,20 +344,20 @@ public boolean isRunning() public String toString() { StringBuilder sb = new StringBuilder( ); - toString(0, sb); + toString( 0, sb ); return sb.toString(); } - private void toString(int indent, StringBuilder sb) + private void toString( int indent, StringBuilder sb ) { for ( int i = 0; i < indent; i++ ) { sb.append( ' ' ); } - sb.append("Lifecycle status:" + status.name()).append( '\n' ); + sb.append( "Lifecycle status:" + status.name() ).append( '\n' ); for ( LifecycleInstance instance : instances ) { - if (instance.instance instanceof LifeSupport) + if ( instance.instance instanceof LifeSupport ) { ((LifeSupport) instance.instance).toString( indent + 3, sb ); } diff --git a/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifecycleException.java b/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifecycleException.java index ea9fa09832d46..8b0f6e16e506c 100644 --- a/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifecycleException.java +++ b/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifecycleException.java @@ -63,6 +63,6 @@ private static String humanReadableMessage( Object instance, LifecycleStatus fro public LifecycleException( Object instance, LifecycleStatus from, LifecycleStatus to, Throwable cause ) { - super( humanReadableMessage( instance, from, to ), cause); + super( humanReadableMessage( instance, from, to ), cause ); } } diff --git a/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifecycleListener.java b/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifecycleListener.java index 5d05bdb9b300d..7ef7f3d668f4e 100644 --- a/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifecycleListener.java +++ b/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifecycleListener.java @@ -25,5 +25,5 @@ */ public interface LifecycleListener { - void notifyStatusChanged(Object instance, LifecycleStatus from, LifecycleStatus to); + void notifyStatusChanged( Object instance, LifecycleStatus from, LifecycleStatus to ); } diff --git a/community/common/src/test/java/org/neo4j/function/SuppliersTest.java b/community/common/src/test/java/org/neo4j/function/SuppliersTest.java index 84338e190b79f..ebfd348830a6b 100644 --- a/community/common/src/test/java/org/neo4j/function/SuppliersTest.java +++ b/community/common/src/test/java/org/neo4j/function/SuppliersTest.java @@ -75,10 +75,10 @@ public void adapedSupplierShouldOnlyCallAdaptorOnceForEachNewInstance() Supplier mockSupplier = mock( Supplier.class ); when( mockSupplier.get() ).thenReturn( o1, o1, o1, o2, o3, o3 ); - Function mockFunction = mock( Function.class ); - when( mockFunction.apply( o1 ) ).thenReturn(o1a); - when( mockFunction.apply( o2 ) ).thenReturn(o2a); - when( mockFunction.apply( o3 ) ).thenReturn(o3a); + Function mockFunction = mock( Function.class ); + when( mockFunction.apply( o1 ) ).thenReturn( o1a ); + when( mockFunction.apply( o2 ) ).thenReturn( o2a ); + when( mockFunction.apply( o3 ) ).thenReturn( o3a ); Supplier supplier = Suppliers.adapted( mockSupplier, mockFunction ); diff --git a/community/common/src/test/java/org/neo4j/kernel/lifecycle/LifeRule.java b/community/common/src/test/java/org/neo4j/kernel/lifecycle/LifeRule.java index 95329520f547e..a13587ce1c1da 100644 --- a/community/common/src/test/java/org/neo4j/kernel/lifecycle/LifeRule.java +++ b/community/common/src/test/java/org/neo4j/kernel/lifecycle/LifeRule.java @@ -81,7 +81,7 @@ public void evaluate() throws Throwable public T add( T instance ) { - return life.add(instance); + return life.add( instance ); } public void init() diff --git a/community/common/src/test/java/org/neo4j/kernel/lifecycle/LifeSupportTest.java b/community/common/src/test/java/org/neo4j/kernel/lifecycle/LifeSupportTest.java index a2e3ffbd4af4d..19e9ac5caba6f 100644 --- a/community/common/src/test/java/org/neo4j/kernel/lifecycle/LifeSupportTest.java +++ b/community/common/src/test/java/org/neo4j/kernel/lifecycle/LifeSupportTest.java @@ -37,8 +37,7 @@ public class LifeSupportTest { @Test - public void testOkLifecycle() - throws LifecycleException + public void testOkLifecycle() throws LifecycleException { LifeSupport lifeSupport = newLifeSupport(); @@ -50,34 +49,34 @@ public void testOkLifecycle() lifeSupport.add( instance3 ); lifeSupport.init(); - assertEquals( LifecycleStatus.STOPPED, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.STOPPED, instance1.getStatus()); - assertEquals( LifecycleStatus.STOPPED, instance2.getStatus()); - assertEquals( LifecycleStatus.STOPPED, instance3.getStatus()); + assertEquals( LifecycleStatus.STOPPED, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance1.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance2.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance3.getStatus() ); lifeSupport.start(); - assertEquals( LifecycleStatus.STARTED, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.STARTED, instance1.getStatus()); + assertEquals( LifecycleStatus.STARTED, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.STARTED, instance1.getStatus() ); assertEquals( LifecycleStatus.STARTED, instance2.getStatus() ); - assertEquals( LifecycleStatus.STARTED, instance3.getStatus()); + assertEquals( LifecycleStatus.STARTED, instance3.getStatus() ); lifeSupport.stop(); - assertEquals( LifecycleStatus.STOPPED, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.STOPPED, instance1.getStatus()); - assertEquals( LifecycleStatus.STOPPED, instance2.getStatus()); - assertEquals( LifecycleStatus.STOPPED, instance3.getStatus()); + assertEquals( LifecycleStatus.STOPPED, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance1.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance2.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance3.getStatus() ); lifeSupport.start(); - assertEquals( LifecycleStatus.STARTED, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.STARTED, instance1.getStatus()); - assertEquals( LifecycleStatus.STARTED, instance2.getStatus()); - assertEquals( LifecycleStatus.STARTED, instance3.getStatus()); + assertEquals( LifecycleStatus.STARTED, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.STARTED, instance1.getStatus() ); + assertEquals( LifecycleStatus.STARTED, instance2.getStatus() ); + assertEquals( LifecycleStatus.STARTED, instance3.getStatus() ); lifeSupport.shutdown(); - assertEquals( LifecycleStatus.SHUTDOWN, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.SHUTDOWN, instance1.getStatus()); - assertEquals( LifecycleStatus.SHUTDOWN, instance2.getStatus()); - assertEquals( LifecycleStatus.SHUTDOWN, instance3.getStatus()); + assertEquals( LifecycleStatus.SHUTDOWN, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.SHUTDOWN, instance1.getStatus() ); + assertEquals( LifecycleStatus.SHUTDOWN, instance2.getStatus() ); + assertEquals( LifecycleStatus.SHUTDOWN, instance3.getStatus() ); } @Test() @@ -102,10 +101,10 @@ public void testFailingInit() { assertEquals( initThrowable, throwable.getCause() ); } - assertEquals( LifecycleStatus.SHUTDOWN, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.SHUTDOWN , instance1.getStatus()); - assertEquals( LifecycleStatus.NONE , instance2.getStatus() ); - assertEquals( LifecycleStatus.NONE , instance3.getStatus() ); + assertEquals( LifecycleStatus.SHUTDOWN, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.SHUTDOWN, instance1.getStatus() ); + assertEquals( LifecycleStatus.NONE, instance2.getStatus() ); + assertEquals( LifecycleStatus.NONE, instance3.getStatus() ); } @Test() @@ -130,10 +129,10 @@ public void testFailingStart() { assertEquals( startThrowable, throwable.getCause() ); } - assertEquals( LifecycleStatus.STOPPED, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.STOPPED , instance1.getStatus()); - assertEquals( LifecycleStatus.STOPPED , instance2.getStatus() ); - assertEquals( LifecycleStatus.STOPPED , instance3.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance1.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance2.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance3.getStatus() ); } @Test() @@ -164,9 +163,9 @@ public void testFailingStartAndFailingStop() } assertEquals( LifecycleStatus.STOPPED, lifeSupport.getStatus() ); - assertEquals( LifecycleStatus.STOPPED , instance1.getStatus()); - assertEquals( LifecycleStatus.STOPPED , instance2.getStatus() ); - assertEquals( LifecycleStatus.STOPPED , instance3.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance1.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance2.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance3.getStatus() ); } @Test() @@ -194,10 +193,10 @@ public void testFailingStop() { assertEquals( stopThrowable, throwable.getCause() ); } - assertEquals( LifecycleStatus.STOPPED, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.STOPPED , instance1.getStatus()); - assertEquals( LifecycleStatus.STOPPED , instance2.getStatus() ); - assertEquals( LifecycleStatus.STOPPED , instance3.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance1.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance2.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance3.getStatus() ); } @Test() @@ -225,10 +224,10 @@ public void testFailingShutdown() { assertEquals( shutdownThrowable, throwable.getCause() ); } - assertEquals( LifecycleStatus.SHUTDOWN, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.SHUTDOWN , instance1.getStatus()); - assertEquals( LifecycleStatus.SHUTDOWN , instance2.getStatus() ); - assertEquals( LifecycleStatus.SHUTDOWN , instance3.getStatus() ); + assertEquals( LifecycleStatus.SHUTDOWN, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.SHUTDOWN, instance1.getStatus() ); + assertEquals( LifecycleStatus.SHUTDOWN, instance2.getStatus() ); + assertEquals( LifecycleStatus.SHUTDOWN, instance3.getStatus() ); } @Test @@ -245,34 +244,34 @@ public void testRestartOk() lifeSupport.add( instance3 ); lifeSupport.init(); - assertEquals( LifecycleStatus.STOPPED, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.STOPPED, instance1.getStatus()); - assertEquals( LifecycleStatus.STOPPED, instance2.getStatus()); - assertEquals( LifecycleStatus.STOPPED, instance3.getStatus()); + assertEquals( LifecycleStatus.STOPPED, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance1.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance2.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance3.getStatus() ); lifeSupport.start(); - assertEquals( LifecycleStatus.STARTED, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.STARTED, instance1.getStatus()); + assertEquals( LifecycleStatus.STARTED, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.STARTED, instance1.getStatus() ); assertEquals( LifecycleStatus.STARTED, instance2.getStatus() ); - assertEquals( LifecycleStatus.STARTED, instance3.getStatus()); + assertEquals( LifecycleStatus.STARTED, instance3.getStatus() ); lifeSupport.stop(); - assertEquals( LifecycleStatus.STOPPED, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.STOPPED, instance1.getStatus()); - assertEquals( LifecycleStatus.STOPPED, instance2.getStatus()); - assertEquals( LifecycleStatus.STOPPED, instance3.getStatus()); + assertEquals( LifecycleStatus.STOPPED, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance1.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance2.getStatus() ); + assertEquals( LifecycleStatus.STOPPED, instance3.getStatus() ); lifeSupport.start(); - assertEquals( LifecycleStatus.STARTED, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.STARTED, instance1.getStatus()); - assertEquals( LifecycleStatus.STARTED, instance2.getStatus()); - assertEquals( LifecycleStatus.STARTED, instance3.getStatus()); + assertEquals( LifecycleStatus.STARTED, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.STARTED, instance1.getStatus() ); + assertEquals( LifecycleStatus.STARTED, instance2.getStatus() ); + assertEquals( LifecycleStatus.STARTED, instance3.getStatus() ); lifeSupport.shutdown(); - assertEquals( LifecycleStatus.SHUTDOWN, lifeSupport.getStatus()); - assertEquals( LifecycleStatus.SHUTDOWN, instance1.getStatus()); - assertEquals( LifecycleStatus.SHUTDOWN, instance2.getStatus()); - assertEquals( LifecycleStatus.SHUTDOWN, instance3.getStatus()); + assertEquals( LifecycleStatus.SHUTDOWN, lifeSupport.getStatus() ); + assertEquals( LifecycleStatus.SHUTDOWN, instance1.getStatus() ); + assertEquals( LifecycleStatus.SHUTDOWN, instance2.getStatus() ); + assertEquals( LifecycleStatus.SHUTDOWN, instance3.getStatus() ); } @Test @@ -361,7 +360,7 @@ public void testInitFailsShutdownWorks() throws Throwable { //given LifeSupport lifeSupport = newLifeSupport(); - Lifecycle lifecycle = mock( Lifecycle.class); + Lifecycle lifecycle = mock( Lifecycle.class ); RuntimeException runtimeException = new RuntimeException(); //when @@ -370,7 +369,7 @@ public void testInitFailsShutdownWorks() throws Throwable try { lifeSupport.init(); - fail("Expected exception"); + fail( "Expected exception" ); } catch ( LifecycleException e ) { @@ -384,8 +383,8 @@ public void testInitFailsShutdownWorks() throws Throwable public void testInitFailsShutdownFails() throws Throwable { LifeSupport lifeSupport = newLifeSupport(); - Lifecycle lifecycle1 = mock( Lifecycle.class); - Lifecycle lifecycle2 = mock( Lifecycle.class); + Lifecycle lifecycle1 = mock( Lifecycle.class ); + Lifecycle lifecycle2 = mock( Lifecycle.class ); RuntimeException initRuntimeException = new RuntimeException(); RuntimeException shutdownRuntimeException = new RuntimeException(); doThrow( initRuntimeException ).when( lifecycle2 ).init(); @@ -395,14 +394,14 @@ public void testInitFailsShutdownFails() throws Throwable try { lifeSupport.init(); - fail("Expected exception"); + fail( "Expected exception" ); } catch ( LifecycleException e ) { assertEquals( initRuntimeException, e.getCause() ); assertEquals( 1, e.getSuppressed().length ); assertEquals( shutdownRuntimeException, e.getSuppressed()[0].getCause() ); - assertThat( e.getSuppressed()[0], instanceOf(LifecycleException.class)); + assertThat( e.getSuppressed()[0], instanceOf( LifecycleException.class ) ); } } @@ -411,14 +410,14 @@ public void testInitFailsShutdownFails() throws Throwable public void testStartFailsStopWorks() throws Throwable { LifeSupport lifeSupport = newLifeSupport(); - Lifecycle lifecycle = mock( Lifecycle.class); + Lifecycle lifecycle = mock( Lifecycle.class ); RuntimeException runtimeException = new RuntimeException(); doThrow( runtimeException ).when( lifecycle ).start(); lifeSupport.add( lifecycle ); try { lifeSupport.start(); - fail("Expected exception"); + fail( "Expected exception" ); } catch ( LifecycleException e ) { @@ -432,8 +431,8 @@ public void testStartFailsStopWorks() throws Throwable public void testStartFailsStopFails() throws Throwable { LifeSupport lifeSupport = newLifeSupport(); - Lifecycle lifecycle1 = mock( Lifecycle.class); - Lifecycle lifecycle2 = mock( Lifecycle.class); + Lifecycle lifecycle1 = mock( Lifecycle.class ); + Lifecycle lifecycle2 = mock( Lifecycle.class ); RuntimeException startRuntimeException = new RuntimeException(); RuntimeException stopRuntimeException = new RuntimeException(); doThrow( startRuntimeException ).when( lifecycle2 ).start(); @@ -443,14 +442,14 @@ public void testStartFailsStopFails() throws Throwable try { lifeSupport.start(); - fail("Expected exception"); + fail( "Expected exception" ); } catch ( LifecycleException e ) { assertEquals( startRuntimeException, e.getCause() ); assertEquals( 1, e.getSuppressed().length ); assertEquals( stopRuntimeException, e.getSuppressed()[0].getCause() ); - assertThat( e.getSuppressed()[0], instanceOf(LifecycleException.class)); + assertThat( e.getSuppressed()[0], instanceOf( LifecycleException.class ) ); } } @@ -459,7 +458,7 @@ public void testStartFailsStopFails() throws Throwable public void testStopFailsShutdownWorks() throws Throwable { LifeSupport lifeSupport = newLifeSupport(); - Lifecycle lifecycle = mock( Lifecycle.class); + Lifecycle lifecycle = mock( Lifecycle.class ); RuntimeException runtimeException = new RuntimeException(); doThrow( runtimeException ).when( lifecycle ).stop(); lifeSupport.add( lifecycle ); @@ -467,7 +466,7 @@ public void testStopFailsShutdownWorks() throws Throwable try { lifeSupport.stop(); - fail("Expected exception"); + fail( "Expected exception" ); } catch ( LifecycleException e ) { @@ -481,8 +480,8 @@ public void testStopFailsShutdownWorks() throws Throwable public void testStopFailsShutdownFails() throws Throwable { LifeSupport lifeSupport = newLifeSupport(); - Lifecycle lifecycle1 = mock( Lifecycle.class); - Lifecycle lifecycle2 = mock( Lifecycle.class); + Lifecycle lifecycle1 = mock( Lifecycle.class ); + Lifecycle lifecycle2 = mock( Lifecycle.class ); RuntimeException stopRuntimeException = new RuntimeException(); RuntimeException shutdownRuntimeException = new RuntimeException(); doThrow( stopRuntimeException ).when( lifecycle2 ).stop(); @@ -493,20 +492,19 @@ public void testStopFailsShutdownFails() throws Throwable try { lifeSupport.shutdown(); - fail("Expected exception"); + fail( "Expected exception" ); } catch ( LifecycleException e ) { assertEquals( stopRuntimeException, e.getCause() ); assertEquals( 1, e.getSuppressed().length ); assertEquals( shutdownRuntimeException, e.getSuppressed()[0].getCause() ); - assertThat( e.getSuppressed()[0], instanceOf(LifecycleException.class)); + assertThat( e.getSuppressed()[0], instanceOf( LifecycleException.class ) ); } } - public class LifecycleMock - implements Lifecycle + public class LifecycleMock implements Lifecycle { Throwable initThrowable; Throwable startThrowable; @@ -515,11 +513,8 @@ public class LifecycleMock List transitions; - public LifecycleMock( Throwable initThrowable, - Throwable startThrowable, - Throwable stopThrowable, - Throwable shutdownThrowable - ) + public LifecycleMock( Throwable initThrowable, Throwable startThrowable, Throwable stopThrowable, + Throwable shutdownThrowable ) { this.initThrowable = initThrowable; this.startThrowable = startThrowable; @@ -531,34 +526,31 @@ public LifecycleMock( Throwable initThrowable, } @Override - public void init() - throws Throwable + public void init() throws Throwable { if ( initThrowable != null ) { throw initThrowable; } - transitions.add(LifecycleStatus.STOPPED); + transitions.add( LifecycleStatus.STOPPED ); } @Override - public void start() - throws Throwable + public void start() throws Throwable { if ( startThrowable != null ) { throw startThrowable; } - transitions.add(LifecycleStatus.STARTED); + transitions.add( LifecycleStatus.STARTED ); } @Override - public void stop() - throws Throwable + public void stop() throws Throwable { - transitions.add(LifecycleStatus.STOPPED); + transitions.add( LifecycleStatus.STOPPED ); if ( stopThrowable != null ) { @@ -567,10 +559,9 @@ public void stop() } @Override - public void shutdown() - throws Throwable + public void shutdown() throws Throwable { - transitions.add(LifecycleStatus.SHUTDOWN); + transitions.add( LifecycleStatus.SHUTDOWN ); if ( shutdownThrowable != null ) { diff --git a/community/common/src/test/java/org/neo4j/kernel/lifecycle/TestLifecycleException.java b/community/common/src/test/java/org/neo4j/kernel/lifecycle/TestLifecycleException.java index f52f6faa006c9..5ab8c3eff6890 100644 --- a/community/common/src/test/java/org/neo4j/kernel/lifecycle/TestLifecycleException.java +++ b/community/common/src/test/java/org/neo4j/kernel/lifecycle/TestLifecycleException.java @@ -34,33 +34,29 @@ public class TestLifecycleException @Test public void shouldMakeNoneToStoppedIntoHumanReadableInitMessage() throws Exception { - assertThat( - exceptionFor( NONE, STOPPED ).getMessage(), - is("Component 'SomeComponent' failed to initialize. Please see attached cause exception.")); + assertThat( exceptionFor( NONE, STOPPED ).getMessage(), + is( "Component 'SomeComponent' failed to initialize. Please see attached cause exception." ) ); } @Test public void shouldMakeStoppedToStartedIntoHumanReadableStartingMessage() throws Exception { - assertThat( - exceptionFor( STOPPED, STARTED ).getMessage(), - is("Component 'SomeComponent' was successfully initialized, but failed to start. Please see attached cause exception.")); + assertThat( exceptionFor( STOPPED, STARTED ).getMessage(), + is( "Component 'SomeComponent' was successfully initialized, but failed to start. Please see attached cause exception." ) ); } @Test public void shouldMakeStartedToStoppedIntoHumanReadableStoppingMessage() throws Exception { - assertThat( - exceptionFor( STARTED, STOPPED ).getMessage(), - is("Component 'SomeComponent' failed to stop. Please see attached cause exception.")); + assertThat( exceptionFor( STARTED, STOPPED ).getMessage(), + is( "Component 'SomeComponent' failed to stop. Please see attached cause exception." ) ); } @Test public void shouldMakeShutdownIntoHumanReadableShutdownMessage() throws Exception { - assertThat( - exceptionFor( STOPPED, SHUTDOWN ).getMessage(), - is("Component 'SomeComponent' failed to shut down. Please see attached cause exception.")); + assertThat( exceptionFor( STOPPED, SHUTDOWN ).getMessage(), + is( "Component 'SomeComponent' failed to shut down. Please see attached cause exception." ) ); } private LifecycleException exceptionFor( LifecycleStatus from, LifecycleStatus to ) diff --git a/community/common/src/test/java/org/neo4j/test/rule/RepeatRule.java b/community/common/src/test/java/org/neo4j/test/rule/RepeatRule.java index dfa966eb7a544..6d04d8ff823b3 100644 --- a/community/common/src/test/java/org/neo4j/test/rule/RepeatRule.java +++ b/community/common/src/test/java/org/neo4j/test/rule/RepeatRule.java @@ -40,7 +40,7 @@ public class RepeatRule implements TestRule { @Retention( RetentionPolicy.RUNTIME ) - @Target(ElementType.METHOD) + @Target( ElementType.METHOD ) public @interface Repeat { int times(); @@ -72,7 +72,7 @@ public void evaluate() throws Throwable @Override public Statement apply( Statement base, Description description ) { - Repeat repeat = description.getAnnotation(Repeat.class); + Repeat repeat = description.getAnnotation( Repeat.class ); if ( repeat != null ) { return new RepeatStatement( repeat.times(), base ); diff --git a/community/common/src/test/java/org/neo4j/test/rule/SuppressOutput.java b/community/common/src/test/java/org/neo4j/test/rule/SuppressOutput.java index 9f9167b0bda80..9798be97a3b20 100644 --- a/community/common/src/test/java/org/neo4j/test/rule/SuppressOutput.java +++ b/community/common/src/test/java/org/neo4j/test/rule/SuppressOutput.java @@ -90,7 +90,7 @@ public Voice suppress() { final ByteArrayOutputStream buffer = new ByteArrayOutputStream(); final PrintStream old = replace( new PrintStream( buffer ) ); - return new Voice(this, buffer) + return new Voice( this, buffer ) { @Override void restore( boolean failure ) throws IOException @@ -131,7 +131,7 @@ public Voice suppress() logger.addHandler( replacement ); logger.setLevel( Level.ALL ); } - return new Voice(this, redirectTo) + return new Voice( this, redirectTo ) { @Override void restore( boolean failure ) throws IOException @@ -235,7 +235,7 @@ public abstract static class Voice private Suppressible suppressible; private ByteArrayOutputStream voiceStream; - public Voice(Suppressible suppressible, ByteArrayOutputStream originalStream) + public Voice( Suppressible suppressible, ByteArrayOutputStream originalStream ) { this.suppressible = suppressible; this.voiceStream = originalStream; diff --git a/community/configuration/src/main/java/org/neo4j/configuration/ExternalSettings.java b/community/configuration/src/main/java/org/neo4j/configuration/ExternalSettings.java index 6fd715d8e7d41..8e2ce148285f0 100644 --- a/community/configuration/src/main/java/org/neo4j/configuration/ExternalSettings.java +++ b/community/configuration/src/main/java/org/neo4j/configuration/ExternalSettings.java @@ -57,7 +57,7 @@ private static DummySetting dummySetting( String name ) return new DummySetting( name, "", "a string" ); } - private static DummySetting dummySetting( String name, String defVal) + private static DummySetting dummySetting( String name, String defVal ) { return new DummySetting( name, defVal, "a string" ); } diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/CheckConsistencyCommand.java b/community/consistency-check/src/main/java/org/neo4j/consistency/CheckConsistencyCommand.java index a0f802f8e8310..e3c3eb33414f6 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/CheckConsistencyCommand.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/CheckConsistencyCommand.java @@ -63,7 +63,7 @@ public class CheckConsistencyCommand implements AdminCommand "Path to backup to check consistency of. Cannot be used together with --database." ) ) .withArgument( new OptionalBooleanArg( "verbose", false, "Enable verbose output." ) ) .withArgument( new OptionalCanonicalPath( "report-dir", "directory", ".", - "Directory to write report file in.") ) + "Directory to write report file in." ) ) .withArgument( new OptionalCanonicalPath( "additional-config", "config-file-path", "", "Configuration file to supply additional configuration in. This argument is DEPRECATED." ) ) .withArgument( new OptionalBooleanArg( CHECK_GRAPH, true, diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java index 28e7969bd17e1..1c5d5ad7b7c4b 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java @@ -98,7 +98,7 @@ public Result runFullConsistencyCheck( File storeDir, Config tuningConfiguration throws ConsistencyCheckIncompleteException, IOException { return runFullConsistencyCheck( storeDir, tuningConfiguration, progressFactory, logProvider, verbose, - new CheckConsistencyConfig(tuningConfiguration) ); + new CheckConsistencyConfig( tuningConfiguration ) ); } public Result runFullConsistencyCheck( File storeDir, Config config, ProgressMonitorFactory progressFactory, @@ -131,7 +131,7 @@ public Result runFullConsistencyCheck( File storeDir, Config tuningConfiguration boolean verbose ) throws ConsistencyCheckIncompleteException, IOException { return runFullConsistencyCheck( storeDir, tuningConfiguration, progressFactory, logProvider, fileSystem, - verbose, new CheckConsistencyConfig(tuningConfiguration) ); + verbose, new CheckConsistencyConfig( tuningConfiguration ) ); } public Result runFullConsistencyCheck( File storeDir, Config config, ProgressMonitorFactory progressFactory, @@ -148,7 +148,7 @@ public Result runFullConsistencyCheck( File storeDir, Config tuningConfiguration boolean verbose, File reportDir ) throws ConsistencyCheckIncompleteException, IOException { return runFullConsistencyCheck( storeDir, tuningConfiguration, progressFactory, logProvider, fileSystem, - verbose, reportDir, new CheckConsistencyConfig(tuningConfiguration ) ); + verbose, reportDir, new CheckConsistencyConfig( tuningConfiguration ) ); } public Result runFullConsistencyCheck( File storeDir, Config config, ProgressMonitorFactory progressFactory, @@ -186,7 +186,7 @@ public Result runFullConsistencyCheck( final File storeDir, Config tuningConfigu throws ConsistencyCheckIncompleteException { return runFullConsistencyCheck( storeDir, tuningConfiguration, progressFactory, logProvider, fileSystem, - pageCache, verbose, new CheckConsistencyConfig(tuningConfiguration ) ); + pageCache, verbose, new CheckConsistencyConfig( tuningConfiguration ) ); } public Result runFullConsistencyCheck( final File storeDir, Config config, ProgressMonitorFactory progressFactory, @@ -205,7 +205,7 @@ public Result runFullConsistencyCheck( final File storeDir, Config tuningConfigu throws ConsistencyCheckIncompleteException { return runFullConsistencyCheck( storeDir, tuningConfiguration, progressFactory, logProvider, fileSystem, - pageCache, verbose, reportDir, new CheckConsistencyConfig(tuningConfiguration) ); + pageCache, verbose, reportDir, new CheckConsistencyConfig( tuningConfiguration ) ); } public Result runFullConsistencyCheck( final File storeDir, Config config, ProgressMonitorFactory progressFactory, diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckSettings.java b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckSettings.java index 3f6c8ddbf7035..cc53326ddcdf6 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckSettings.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckSettings.java @@ -34,22 +34,22 @@ @Description( "Consistency check configuration settings" ) public class ConsistencyCheckSettings implements LoadableConfig { - @Description("This setting is deprecated. See commandline arguments for neoj4-admin check-consistency " + + @Description( "This setting is deprecated. See commandline arguments for neoj4-admin check-consistency " + "instead. Perform optional additional checking on property ownership. " + "This can detect a theoretical inconsistency where a property could be owned by multiple entities. " + - "However, the check is very expensive in time and memory, so it is skipped by default.") + "However, the check is very expensive in time and memory, so it is skipped by default." ) @Deprecated public static final Setting consistency_check_property_owners = setting( "tools.consistency_checker.check_property_owners", BOOLEAN, FALSE ); - @Description("This setting is deprecated. See commandline arguments for neoj4-admin check-consistency " + + @Description( "This setting is deprecated. See commandline arguments for neoj4-admin check-consistency " + "instead. Perform checks on the label scan store. Checking this store is more expensive than " + - "checking the native stores, so it may be useful to turn off this check for very large databases.") + "checking the native stores, so it may be useful to turn off this check for very large databases." ) @Deprecated public static final Setting consistency_check_label_scan_store = setting( "tools.consistency_checker.check_label_scan_store", BOOLEAN, TRUE ); - @Description("This setting is deprecated. See commandline arguments for neoj4-admin check-consistency " + + @Description( "This setting is deprecated. See commandline arguments for neoj4-admin check-consistency " + "instead. Perform checks on indexes. Checking indexes is more expensive than " + - "checking the native stores, so it may be useful to turn off this check for very large databases.") + "checking the native stores, so it may be useful to turn off this check for very large databases." ) @Deprecated public static final Setting consistency_check_indexes = setting( "tools.consistency_checker.check_indexes", BOOLEAN, TRUE ); diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckTool.java b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckTool.java index c9a154180b3a8..6c513141bddc6 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckTool.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckTool.java @@ -112,7 +112,8 @@ ConsistencyCheckService.Result run( String... args ) throws ToolFailureException try { return consistencyCheckService.runFullConsistencyCheck( storeDir, tuningConfiguration, - ProgressMonitorFactory.textual( System.err ), logProvider, fs, verbose, new CheckConsistencyConfig(tuningConfiguration) ); + ProgressMonitorFactory.textual( System.err ), logProvider, fs, verbose, + new CheckConsistencyConfig( tuningConfiguration ) ); } catch ( ConsistencyCheckIncompleteException e ) { diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyReportLog.java b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyReportLog.java index ff9310888e2d0..b92c1676f5e6c 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyReportLog.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyReportLog.java @@ -90,7 +90,7 @@ public Logger errorLogger() public void bulk( @Nonnull Consumer consumer ) { PrintWriter writer; - synchronized (this) + synchronized ( this ) { writer = writerSupplier.get(); consumer.accept( new ConsistencyReportLog( Suppliers.singleton( writer ), lock, false ) ); diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/CheckDecorator.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/CheckDecorator.java index 76d168cf0c380..14a69bd2e02ec 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/CheckDecorator.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/CheckDecorator.java @@ -149,7 +149,7 @@ public void prepare() public OwningRecordCheck decorateNeoStoreChecker( OwningRecordCheck checker ) { - for ( CheckDecorator decorator: decorators) + for ( CheckDecorator decorator : decorators ) { checker = decorator.decorateNeoStoreChecker( checker ); } @@ -160,7 +160,7 @@ public OwningRecordCheck decorateNodeChecker( OwningRecordCheck checker ) { - for ( CheckDecorator decorator: decorators) + for ( CheckDecorator decorator : decorators ) { checker = decorator.decorateNodeChecker( checker ); } @@ -171,7 +171,7 @@ public OwningRecordCheck dec public OwningRecordCheck decorateRelationshipChecker( OwningRecordCheck checker ) { - for ( CheckDecorator decorator: decorators) + for ( CheckDecorator decorator : decorators ) { checker = decorator.decorateRelationshipChecker( checker ); } @@ -182,7 +182,7 @@ public OwningRecordCheck decoratePropertyChecker( RecordCheck checker ) { - for ( CheckDecorator decorator: decorators) + for ( CheckDecorator decorator : decorators ) { checker = decorator.decoratePropertyChecker( checker ); } @@ -193,7 +193,7 @@ public RecordCheck d public RecordCheck decoratePropertyKeyTokenChecker( RecordCheck checker ) { - for ( CheckDecorator decorator: decorators) + for ( CheckDecorator decorator : decorators ) { checker = decorator.decoratePropertyKeyTokenChecker( checker ); } @@ -205,7 +205,7 @@ public RecordCheck decorateRelationshipTypeTokenChecker( RecordCheck checker ) { - for ( CheckDecorator decorator: decorators) + for ( CheckDecorator decorator : decorators ) { checker = decorator.decorateRelationshipTypeTokenChecker( checker ); } @@ -216,7 +216,7 @@ public RecordCheck decorateLabelTokenChecker( RecordCheck checker ) { - for ( CheckDecorator decorator: decorators) + for ( CheckDecorator decorator : decorators ) { checker = decorator.decorateLabelTokenChecker( checker ); } @@ -227,7 +227,7 @@ public RecordCheck decorateRelationshipGroupChecker( RecordCheck checker ) { - for ( CheckDecorator decorator: decorators) + for ( CheckDecorator decorator : decorators ) { checker = decorator.decorateRelationshipGroupChecker( checker ); } diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/DynamicStore.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/DynamicStore.java index ce4a661fa7d9e..0bdb719ded604 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/DynamicStore.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/DynamicStore.java @@ -90,5 +90,5 @@ RecordReference lookup( RecordAccess records, long block ) this.type = type; } - abstract RecordReference lookup(RecordAccess records, long block); + abstract RecordReference lookup( RecordAccess records, long block ); } diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/cache/CacheAccess.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/cache/CacheAccess.java index 5ec17264aa604..7c3a65b9726f9 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/cache/CacheAccess.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/cache/CacheAccess.java @@ -65,7 +65,7 @@ interface Client * @param slot which cache slot for this id. * @return false if slot value is 0, true otherwise. */ - boolean getBooleanFromCache(long id, int slot); + boolean getBooleanFromCache( long id, int slot ); /** * Caches all values for an id, i.e. fills all slots. diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/DynamicOwner.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/DynamicOwner.java index f618efb4b59b8..b4aa96faaa9a3 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/DynamicOwner.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/DynamicOwner.java @@ -164,7 +164,7 @@ else if ( record instanceof PropertyKeyTokenRecord ) abstract static class NameOwner extends DynamicOwner implements ComparativeRecordChecker { - @SuppressWarnings("ConstantConditions") + @SuppressWarnings( "ConstantConditions" ) @Override public void checkReference( RECORD name, AbstractBaseRecord record, CheckerEngine engine, RecordAccess records ) diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/FullCheck.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/FullCheck.java index 42760c19d7303..df77709de3ea8 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/FullCheck.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/FullCheck.java @@ -66,7 +66,7 @@ public class FullCheck public FullCheck( Config tuningConfiguration, ProgressMonitorFactory progressFactory, Statistics statistics, int threads ) { - this(progressFactory, statistics, threads, new CheckConsistencyConfig(tuningConfiguration) ); + this( progressFactory, statistics, threads, new CheckConsistencyConfig( tuningConfiguration ) ); } public FullCheck( ProgressMonitorFactory progressFactory, Statistics statistics, int threads, @@ -167,7 +167,7 @@ static RecordAccess recordAccess( StoreAccess store, CacheAccess cacheAccess ) private static T[] readAllRecords( Class type, RecordStore store ) { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) T[] records = (T[]) Array.newInstance( type, (int) store.getHighId() ); for ( int i = 0; i < records.length; i++ ) { diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/OwnerCheck.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/OwnerCheck.java index 8d45048b0d60a..9af613b6ae0d7 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/OwnerCheck.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/OwnerCheck.java @@ -380,7 +380,7 @@ private abstract class PrimitiveCheckerDecorator engine, RecordAccess records ) { if ( record.inUse() ) @@ -420,7 +420,7 @@ private abstract static class NameCheckerDecorator this.owners = owners; } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) @Override public void check( RECORD record, CheckerEngine engine, RecordAccess records ) { diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java index 3f7594e7df3ec..6be00ecfde4f5 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java @@ -176,7 +176,7 @@ private void checkProperty( NodeRecord record, } PrimitiveIntSet keys = Primitive.intSet(); - for (PropertyRecord property : props) + for ( PropertyRecord property : props ) { if ( !property.inUse() ) { diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/repair/RelationshipChainDirection.java b/community/consistency-check/src/main/java/org/neo4j/consistency/repair/RelationshipChainDirection.java index c6d586471c484..2d7a843d36df6 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/repair/RelationshipChainDirection.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/repair/RelationshipChainDirection.java @@ -19,10 +19,10 @@ */ package org.neo4j.consistency.repair; -import static java.lang.String.format; - import org.neo4j.kernel.impl.store.record.RelationshipRecord; +import static java.lang.String.format; + public enum RelationshipChainDirection { NEXT( RelationshipChainField.FIRST_NEXT, RelationshipChainField.SECOND_NEXT ), @@ -39,11 +39,11 @@ public enum RelationshipChainDirection public RelationshipChainField fieldFor( long nodeId, RelationshipRecord rel ) { - if (rel.getFirstNode() == nodeId) + if ( rel.getFirstNode() == nodeId ) { return first; } - else if (rel.getSecondNode() == nodeId) + else if ( rel.getSecondNode() == nodeId ) { return second; } diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReport.java b/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReport.java index b6501ad2ef09b..8121e264b749b 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReport.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReport.java @@ -45,8 +45,8 @@ public interface ConsistencyReport { - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.METHOD) + @Retention( RetentionPolicy.RUNTIME ) + @Target( ElementType.METHOD ) @interface Warning { } diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReporter.java b/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReporter.java index 8f0b653349ee8..b62a32bc9a487 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReporter.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReporter.java @@ -354,7 +354,7 @@ protected void logWarning( String message, Object[] args ) } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) void checkReference( CheckerEngine engine, ComparativeRecordChecker checker, AbstractBaseRecord referenced, RecordAccess records ) { @@ -362,7 +362,7 @@ void checkReference( CheckerEngine engine, ComparativeRecordChecker checker, Abs } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) void checkDiffReference( CheckerEngine engine, ComparativeRecordChecker checker, AbstractBaseRecord oldReferenced, AbstractBaseRecord newReferenced, RecordAccess records ) @@ -475,7 +475,7 @@ static ProxyFactory get( Class cls ) return (ProxyFactory) instances.get( cls ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) ProxyFactory( Class type ) throws LinkageError { this.type = type; diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/store/CacheSmallStoresRecordAccess.java b/community/consistency-check/src/main/java/org/neo4j/consistency/store/CacheSmallStoresRecordAccess.java index b35abfb55b908..a79da7c5c981e 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/store/CacheSmallStoresRecordAccess.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/store/CacheSmallStoresRecordAccess.java @@ -34,7 +34,7 @@ public CacheSmallStoresRecordAccess( RecordAccess delegate, RelationshipTypeTokenRecord[] relationshipTypes, LabelTokenRecord[] labels ) { - super(delegate); + super( delegate ); this.propertyKeys = propertyKeys; this.relationshipTypes = relationshipTypes; this.labels = labels; diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/store/DirectRecordAccess.java b/community/consistency-check/src/main/java/org/neo4j/consistency/store/DirectRecordAccess.java index 9b96a1bb068c6..5f3fd0c3a98fd 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/store/DirectRecordAccess.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/store/DirectRecordAccess.java @@ -171,7 +171,7 @@ public boolean shouldCheck( long id, MultiPassStore store ) DirectRecordReference referenceTo( RecordStore store, long id ) { - return new DirectRecordReference<>( store.getRecord( id, store.newRecord(), FORCE ), this); + return new DirectRecordReference<>( store.getRecord( id, store.newRecord(), FORCE ), this ); } @Override diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/store/RecordReference.java b/community/consistency-check/src/main/java/org/neo4j/consistency/store/RecordReference.java index b4e83e7f7b170..679d0a654266b 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/store/RecordReference.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/store/RecordReference.java @@ -28,7 +28,7 @@ public interface RecordReference class SkippingReference implements RecordReference { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static SkippingReference skipReference() { return INSTANCE; diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/DynamicRecordCheckTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/DynamicRecordCheckTest.java index bfbccc99805bf..0bf39170fed3f 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/DynamicRecordCheckTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/DynamicRecordCheckTest.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.when; import static org.neo4j.consistency.store.RecordAccessStub.SCHEMA_RECORD_TYPE; -@RunWith(Suite.class) +@RunWith( Suite.class ) @Suite.SuiteClasses( { DynamicRecordCheckTest.StringDynamicRecordCheckTest.class, DynamicRecordCheckTest.ArrayDynamicRecordCheckTest.class, @@ -220,7 +220,7 @@ DynamicRecord fill( DynamicRecord record ) abstract DynamicRecord record( long id ); - @RunWith(JUnit4.class) + @RunWith( JUnit4.class ) public static class StringDynamicRecordCheckTest extends DynamicRecordCheckTest { public StringDynamicRecordCheckTest() @@ -242,7 +242,7 @@ DynamicRecord fill( DynamicRecord record, int size ) } } - @RunWith(JUnit4.class) + @RunWith( JUnit4.class ) public static class ArrayDynamicRecordCheckTest extends DynamicRecordCheckTest { public ArrayDynamicRecordCheckTest() @@ -264,7 +264,7 @@ DynamicRecord fill( DynamicRecord record, int size ) } } - @RunWith(JUnit4.class) + @RunWith( JUnit4.class ) public static class SchemaDynamicRecordCheckTest extends DynamicRecordCheckTest { public SchemaDynamicRecordCheckTest() diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java index 6805922090993..392870f128b8a 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java @@ -450,7 +450,7 @@ public void incrementRelationshipCount( int startLabelId, int typeId, int endLab protected abstract void generateInitialData( GraphDatabaseService graphDb ); - protected void start( @SuppressWarnings("UnusedParameters") File storeDir ) + protected void start( @SuppressWarnings( "UnusedParameters" ) File storeDir ) { // allow for override } diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/NodeRecordCheckTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/NodeRecordCheckTest.java index d006de4220ec2..a7543e3dc40c6 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/NodeRecordCheckTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/NodeRecordCheckTest.java @@ -460,7 +460,7 @@ private long[] createLabels( int labelCount ) private void assertDynamicRecordChain( DynamicRecord... records ) { - if ( records.length > 0) + if ( records.length > 0 ) { for ( int i = 1; i < records.length; i++ ) { diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/RecordCheckTestBase.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/RecordCheckTestBase.java index e9c1ede7daa33..056ff7d1531c0 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/RecordCheckTestBase.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/RecordCheckTestBase.java @@ -118,7 +118,7 @@ public void check( NeoStoreRecord record, public static RecordCheck dummyDynamicCheck( RecordStore store, DynamicStore dereference ) { - return new DynamicRecordCheck(store, dereference ) + return new DynamicRecordCheck( store, dereference ) { @Override public void check( DynamicRecord record, @@ -207,7 +207,7 @@ DynamicRecord addKeyName( DynamicRecord name ) return records.addPropertyKeyName( name ); } - DynamicRecord addRelationshipTypeName(DynamicRecord name ) + DynamicRecord addRelationshipTypeName( DynamicRecord name ) { return records.addRelationshipTypeName( name ); } diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/DuplicatePropertyTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/DuplicatePropertyTest.java index 42f8e76258d22..5029ab322e729 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/DuplicatePropertyTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/DuplicatePropertyTest.java @@ -33,7 +33,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; - import static org.neo4j.consistency.checking.RecordCheckTestBase.inUse; public class DuplicatePropertyTest @@ -48,7 +47,7 @@ public void shouldReportDuplicatePropertyIndexesInPropertyRecordForNode() throws NodeRecord master = records.add( inUse( new NodeRecord( 1, false, -1, 1 ) ) ); - PropertyRecord propertyRecord = inUse( new PropertyRecord(1) ); + PropertyRecord propertyRecord = inUse( new PropertyRecord( 1 ) ); PropertyBlock firstBlock = new PropertyBlock(); firstBlock.setSingleBlock( 1 ); firstBlock.setKeyIndexId( 1 ); diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/ExecutionOrderIntegrationTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/ExecutionOrderIntegrationTest.java index 3fa003601e258..40241b13894b2 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/ExecutionOrderIntegrationTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/ExecutionOrderIntegrationTest.java @@ -140,7 +140,7 @@ private static class InvocationLog private final Map data = new HashMap<>(); private final Map duplicates = new HashMap<>(); - @SuppressWarnings("ThrowableResultOfMethodCallIgnored") + @SuppressWarnings( "ThrowableResultOfMethodCallIgnored" ) void log( PendingReferenceCheck check, InvocationOnMock invocation ) { Method method = invocation.getMethod(); @@ -184,7 +184,7 @@ private static void assertSameChecks( Map singlePassChecks, missing.keySet().removeAll( multiPassChecks.keySet() ); extras.keySet().removeAll( singlePassChecks.keySet() ); - StringBuilder headers = new StringBuilder("\n"); + StringBuilder headers = new StringBuilder( "\n" ); StringWriter diff = new StringWriter(); PrintWriter writer = new PrintWriter( diff ); if ( !missing.isEmpty() ) @@ -330,7 +330,7 @@ private static class LoggingReference implements R this.log = log; } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) @Override public void dispatch( PendingReferenceCheck reporter ) { diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java index 0770c71dd2177..847e91ac324dc 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java @@ -2312,7 +2312,7 @@ private static class Reference { private T value; - void set(T value) + void set( T value ) { this.value = value; } diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/MultiPassStoreTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/MultiPassStoreTest.java index 3b2550a1a3329..51ef0769cfdc9 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/MultiPassStoreTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/MultiPassStoreTest.java @@ -37,14 +37,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyZeroInteractions; -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@RunWith( Suite.class ) +@Suite.SuiteClasses( { MultiPassStoreTest.Nodes.class, MultiPassStoreTest.Relationships.class, MultiPassStoreTest.Properties.class, MultiPassStoreTest.Strings.class, MultiPassStoreTest.Arrays.class -}) +} ) public abstract class MultiPassStoreTest { @Test @@ -74,7 +74,7 @@ public void shouldSkipOtherKindsOfRecords() throws Exception protected abstract void otherRecords( RecordAccess filter, long id ); - @RunWith(JUnit4.class) + @RunWith( JUnit4.class ) public static class Nodes extends MultiPassStoreTest { @Override @@ -99,7 +99,7 @@ protected void otherRecords( RecordAccess filter, long id ) } } - @RunWith(JUnit4.class) + @RunWith( JUnit4.class ) public static class Relationships extends MultiPassStoreTest { @Override @@ -124,7 +124,7 @@ protected void otherRecords( RecordAccess filter, long id ) } } - @RunWith(JUnit4.class) + @RunWith( JUnit4.class ) public static class Properties extends MultiPassStoreTest { @Override @@ -149,7 +149,7 @@ protected void otherRecords( RecordAccess filter, long id ) } } - @RunWith(JUnit4.class) + @RunWith( JUnit4.class ) public static class Strings extends MultiPassStoreTest { @Override @@ -174,7 +174,7 @@ protected void otherRecords( RecordAccess filter, long id ) } } - @RunWith(JUnit4.class) + @RunWith( JUnit4.class ) public static class Arrays extends MultiPassStoreTest { @Override diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/RecordScannerTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/RecordScannerTest.java index 1a38901ea3d2c..da868d8cba1da 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/RecordScannerTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/RecordScannerTest.java @@ -45,12 +45,12 @@ public void shouldProcessRecordsSequentiallyAndUpdateProgress() throws Exception ProgressListener progressListener = mock( ProgressListener.class ); when( progressBuilder.progressForPart( anyString(), anyLong() ) ).thenReturn( progressListener ); - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) BoundedIterable store = mock( BoundedIterable.class ); when( store.iterator() ).thenReturn( asList( 42, 75, 192 ).iterator() ); - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) RecordProcessor recordProcessor = mock( RecordProcessor.class ); RecordScanner scanner = new SequentialRecordScanner<>( "our test task", Statistics.NONE, 1, store, @@ -71,12 +71,12 @@ public void shouldProcessRecordsParallelAndUpdateProgress() throws Exception ProgressListener progressListener = mock( ProgressListener.class ); when( progressBuilder.progressForPart( anyString(), anyLong() ) ).thenReturn( progressListener ); - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) BoundedIterable store = mock( BoundedIterable.class ); when( store.iterator() ).thenReturn( asList( 42, 75, 192 ).iterator() ); - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) RecordProcessor recordProcessor = mock( RecordProcessor.class ); RecordScanner scanner = new ParallelRecordScanner<>( "our test task", Statistics.NONE, 1, store, diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/StoreProcessorTaskTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/StoreProcessorTaskTest.java index 78723031219aa..f0ed4c2b270cd 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/StoreProcessorTaskTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/StoreProcessorTaskTest.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@SuppressWarnings("unchecked") +@SuppressWarnings( "unchecked" ) public class StoreProcessorTaskTest { @Test @@ -47,7 +47,7 @@ public void singlePassShouldOnlyProcessTheStoreOnce() throws Exception when( singlePassProcessor.getStage() ).thenReturn( Stage.SEQUENTIAL_FORWARD ); NodeStore store = mock( NodeStore.class ); - when( store.getStorageFileName() ).thenReturn( new File("node-store") ); + when( store.getStorageFileName() ).thenReturn( new File( "node-store" ) ); StoreProcessorTask task = new StoreProcessorTask<>( "nodes", Statistics.NONE, 1, store, null, "nodes", ProgressMonitorFactory.NONE.multipleParts( "check" ), diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/repair/OwningNodeRelationshipChainTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/repair/OwningNodeRelationshipChainTest.java index ff5e32b2fbd79..7e9d24a4722dd 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/repair/OwningNodeRelationshipChainTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/repair/OwningNodeRelationshipChainTest.java @@ -35,7 +35,6 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import static org.neo4j.kernel.impl.store.record.Record.NO_NEXT_PROPERTY; public class OwningNodeRelationshipChainTest @@ -58,7 +57,7 @@ public void shouldFindBothChainsThatTheRelationshipRecordShouldBelongTo() throws new RelationshipRecord( sharedRel, node1, node2, relType ), new RelationshipRecord( node2Rel + 1, node2, node2 + 1, relType ) ); - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) RecordStore recordStore = mock( RecordStore.class ); when( recordStore.getRecord( eq( node1 ), any( NodeRecord.class ), any( RecordLoad.class ) ) ) .thenAnswer( new ReadNodeAnswer( false, node1Rel, NO_NEXT_PROPERTY.intValue() ) ); diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java index 29e1e1a24849a..eaf1321de0922 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java @@ -84,9 +84,9 @@ import static org.neo4j.consistency.report.ConsistencyReporter.NO_MONITOR; import static org.neo4j.kernel.impl.store.counts.keys.CountsKeyFactory.nodeKey; -@RunWith(Suite.class) -@Suite.SuiteClasses({ConsistencyReporterTest.TestAllReportMessages.class, - ConsistencyReporterTest.TestReportLifecycle.class}) +@RunWith( Suite.class ) +@Suite.SuiteClasses( {ConsistencyReporterTest.TestAllReportMessages.class, + ConsistencyReporterTest.TestReportLifecycle.class} ) public class ConsistencyReporterTest { public static class TestReportLifecycle @@ -99,7 +99,7 @@ public void shouldSummarizeStatisticsAfterCheck() { // given ConsistencySummaryStatistics summary = mock( ConsistencySummaryStatistics.class ); - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) RecordAccess records = mock( RecordAccess.class ); ConsistencyReporter.ReportHandler handler = new ConsistencyReporter.ReportHandler( new InconsistencyReport( mock( InconsistencyLogger.class ), summary ), @@ -115,7 +115,7 @@ public void shouldSummarizeStatisticsAfterCheck() } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldOnlySummarizeStatisticsWhenAllReferencesAreChecked() { // given @@ -202,11 +202,11 @@ public void warning( RecordType recordType, AbstractBaseRecord oldRecord, Abstra } } - @RunWith(Parameterized.class) + @RunWith( Parameterized.class ) public static class TestAllReportMessages implements Answer { @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldLogInconsistency() throws Exception { // given @@ -413,7 +413,7 @@ private Object parameter( Class type ) throw new IllegalArgumentException( format( "Don't know how to provide parameter of type %s", type.getName() ) ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private RecordCheck mockChecker() { RecordCheck checker = mock( RecordCheck.class ); diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/report/PendingReferenceCheckTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/report/PendingReferenceCheckTest.java index f6a7cda06ec2c..f0014667c2ff0 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/report/PendingReferenceCheckTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/report/PendingReferenceCheckTest.java @@ -29,7 +29,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; - import static org.neo4j.consistency.report.ConsistencyReporter.NO_MONITOR; public class PendingReferenceCheckTest @@ -37,7 +36,7 @@ public class PendingReferenceCheckTest // given { RecordAccess records = mock( RecordAccess.class ); - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) ConsistencyReporter.ReportHandler handler = new ConsistencyReporter.ReportHandler( mock( InconsistencyReport.class ), diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/store/CacheSmallStoresRecordAccessTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/store/CacheSmallStoresRecordAccessTest.java index c7cccbbaf3937..92a2bfc92870e 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/store/CacheSmallStoresRecordAccessTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/store/CacheSmallStoresRecordAccessTest.java @@ -103,7 +103,7 @@ public void shouldServePropertyKeysAndRelationshipLabelsFromSuppliedArrayCaches( verifyZeroInteractions( delegate ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private static Matcher> isDirectReferenceTo( T record ) { return (Matcher) new DirectReferenceMatcher( record ); @@ -114,7 +114,7 @@ private static class DirectReferenceMatcher { private final T record; - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) DirectReferenceMatcher( T record ) { super( DirectRecordReference.class ); diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/store/RecordAccessStub.java b/community/consistency-check/src/test/java/org/neo4j/consistency/store/RecordAccessStub.java index e408f74c80e05..0441306f01365 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/store/RecordAccessStub.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/store/RecordAccessStub.java @@ -71,7 +71,7 @@ CheckerEngine engine( final RECORD record, final REPORT report ) return new Engine( report ) { @Override - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) void checkReference( ComparativeRecordChecker checker, AbstractBaseRecord oldReference, AbstractBaseRecord newReference ) { @@ -86,7 +86,7 @@ CheckerEngine engine( final RECORD oldRecord, final RECORD newRe return new Engine( report ) { @Override - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) void checkReference( ComparativeRecordChecker checker, AbstractBaseRecord oldReference, AbstractBaseRecord newReference ) { @@ -113,7 +113,7 @@ public void comparativeCheck( deferredTasks.add( new Runnable() { @Override - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void run() { PendingReferenceCheck mock = mock( PendingReferenceCheck.class ); diff --git a/community/consistency-check/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java b/community/consistency-check/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java index b71b939b83766..59a39493a38c6 100644 --- a/community/consistency-check/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java @@ -147,7 +147,7 @@ public long maxMemoryUsage() private final IdGenerator idGenerator; private final boolean multiPassIterators; - @Parameterized.Parameters(name = "{0},{1},{3}") + @Parameterized.Parameters( name = "{0},{1},{3}" ) public static Collection data() { return Arrays.asList( diff --git a/community/csv/src/main/java/org/neo4j/csv/reader/Extractors.java b/community/csv/src/main/java/org/neo4j/csv/reader/Extractors.java index b8cef1dd5dac6..b27172a3d3e80 100644 --- a/community/csv/src/main/java/org/neo4j/csv/reader/Extractors.java +++ b/community/csv/src/main/java/org/neo4j/csv/reader/Extractors.java @@ -326,7 +326,7 @@ protected boolean nullValue( int length, boolean skippedChars ) protected boolean extract0( char[] data, int offset, int length ) { value = new String( data, offset, length ); - if (trimStrings) + if ( trimStrings ) { value = value.trim(); } @@ -947,7 +947,7 @@ private static long extractLong( char[] data, int originalOffset, int fullLength try { - for (int i = 0; i < length; i++ ) + for ( int i = 0; i < length; i++ ) { result = result * 10 + digit( data[offset + i] ); } diff --git a/community/csv/src/test/java/org/neo4j/csv/reader/ExtractorsTest.java b/community/csv/src/test/java/org/neo4j/csv/reader/ExtractorsTest.java index 73c8b55e96b6b..4f60ca944468c 100644 --- a/community/csv/src/test/java/org/neo4j/csv/reader/ExtractorsTest.java +++ b/community/csv/src/test/java/org/neo4j/csv/reader/ExtractorsTest.java @@ -227,7 +227,7 @@ public void shouldExtractNullForEmptyQuotedStringIfConfiguredTo() throws Excepti public void shouldTrimStringIfConfiguredTo() throws Exception { // GIVEN - Extractors extractors = new Extractors( ',', true, true); + Extractors extractors = new Extractors( ',', true, true ); String value = " abcde fgh "; // WHEN @@ -243,7 +243,7 @@ public void shouldTrimStringIfConfiguredTo() throws Exception public void shouldNotTrimStringIfNotConfiguredTo() throws Exception { // GIVEN - Extractors extractors = new Extractors( ',', true, false); + Extractors extractors = new Extractors( ',', true, false ); String value = " abcde fgh "; // WHEN diff --git a/community/csv/src/test/java/org/neo4j/csv/reader/ReadablesTest.java b/community/csv/src/test/java/org/neo4j/csv/reader/ReadablesTest.java index 64db6d76dc2b2..fa92fa8be811d 100644 --- a/community/csv/src/test/java/org/neo4j/csv/reader/ReadablesTest.java +++ b/community/csv/src/test/java/org/neo4j/csv/reader/ReadablesTest.java @@ -59,13 +59,13 @@ public class ReadablesTest public static Collection readMethods() { return Arrays.asList( - (readable,length) -> + ( readable, length ) -> { SectionedCharBuffer readText = new SectionedCharBuffer( length ); readable.read( readText, readText.front() ); return copyOfRange( readText.array(), readText.pivot(), readText.front() ); }, - (readable,length) -> + ( readable, length ) -> { char[] result = new char[length]; readable.read( result, 0, length ); diff --git a/community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/ResultRowImpl.java b/community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/ResultRowImpl.java index 496f1dd2cf8c4..17bbf224c25dc 100644 --- a/community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/ResultRowImpl.java +++ b/community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/ResultRowImpl.java @@ -42,7 +42,7 @@ public ResultRowImpl( ) this( new HashMap<>() ); } - public void set( String k, Object value) + public void set( String k, Object value ) { results.put( k, value ); } @@ -104,7 +104,7 @@ private T get( String key, Class type ) { String message = String.format("The current item in column \"%s\" is not a %s; it's \"%s\"", key, type.getSimpleName(), value); - throw new NoSuchElementException(message); + throw new NoSuchElementException( message ); } } } diff --git a/community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/common/CypherOrderability.java b/community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/common/CypherOrderability.java index a29baf152676f..74d2be237c53b 100644 --- a/community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/common/CypherOrderability.java +++ b/community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/common/CypherOrderability.java @@ -287,7 +287,9 @@ else if ( lhs instanceof String && rhs instanceof Character ) return ((String) lhs).compareTo( rhs.toString() ); } else - { return ((Comparable) lhs).compareTo( rhs ); } + { + return ((Comparable) lhs).compareTo( rhs ); + } } }; diff --git a/community/cypher/cypher-compiler-3.2/src/main/scala/org/neo4j/cypher/internal/compiler/v3_2/executionplan/EntityAccessor.java b/community/cypher/cypher-compiler-3.2/src/main/scala/org/neo4j/cypher/internal/compiler/v3_2/executionplan/EntityAccessor.java index ced86c1cd286d..6f81c90947a3e 100644 --- a/community/cypher/cypher-compiler-3.2/src/main/scala/org/neo4j/cypher/internal/compiler/v3_2/executionplan/EntityAccessor.java +++ b/community/cypher/cypher-compiler-3.2/src/main/scala/org/neo4j/cypher/internal/compiler/v3_2/executionplan/EntityAccessor.java @@ -24,6 +24,7 @@ public interface EntityAccessor { - Node newNodeProxyById(long id); - Relationship newRelationshipProxyById(long id); + Node newNodeProxyById( long id ); + + Relationship newRelationshipProxyById( long id ); } diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/export/DatabaseSubGraph.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/export/DatabaseSubGraph.java index 4e2b71a8c27f7..db205564fb336 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/export/DatabaseSubGraph.java +++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/export/DatabaseSubGraph.java @@ -40,7 +40,7 @@ public DatabaseSubGraph( GraphDatabaseService gdb ) public static SubGraph from( GraphDatabaseService gdb ) { - return new DatabaseSubGraph(gdb); + return new DatabaseSubGraph( gdb ); } @Override @@ -56,9 +56,9 @@ public Iterable getRelationships() } @Override - public boolean contains(Relationship relationship) + public boolean contains( Relationship relationship ) { - return relationship.getGraphDatabase().equals(gdb); + return relationship.getGraphDatabase().equals( gdb ); } @Override diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledConversionUtils.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledConversionUtils.java index b9d22473729f0..73cbb8cf35558 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledConversionUtils.java +++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledConversionUtils.java @@ -97,9 +97,13 @@ private CompositeKey( long[] key ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } CompositeKey that = (CompositeKey) o; diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledEquivalenceUtils.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledEquivalenceUtils.java index 10854e8c12296..59f8454bcacef 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledEquivalenceUtils.java +++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledEquivalenceUtils.java @@ -146,11 +146,11 @@ else if ( lhs instanceof List && rhs instanceof List ) } return true; } - else if (lhs instanceof Map && rhs instanceof Map) + else if ( lhs instanceof Map && rhs instanceof Map ) { Map rMap = (Map) rhs; Map lMap = (Map) lhs; - if (rMap.size() != lMap.size()) + if ( rMap.size() != lMap.size() ) { return false; } diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledMathHelper.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledMathHelper.java index 30ef457c65bf7..158afc378aad7 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledMathHelper.java +++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledMathHelper.java @@ -119,7 +119,7 @@ else if ( rhsClass.isArray() ) { throw new ArithmeticException( String.format( "result of %d + %d cannot be represented as an integer", - ((Number) lhs).longValue(), ((Number) rhs).longValue() ), e); + ((Number) lhs).longValue(), ((Number) rhs).longValue() ), e ); } } // other numbers we cannot add @@ -156,7 +156,7 @@ public static Object subtract( Object lhs, Object rhs ) { throw new ArithmeticException( String.format( "result of %d - %d cannot be represented as an integer", - ((Number) lhs).longValue(), ((Number) rhs).longValue() ), e); + ((Number) lhs).longValue(), ((Number) rhs).longValue() ), e ); } } // other numbers we cannot subtract @@ -193,7 +193,7 @@ public static Object multiply( Object lhs, Object rhs ) { throw new ArithmeticException( String.format( "result of %d * %d cannot be represented as an integer", - ((Number) lhs).longValue(), ((Number) rhs).longValue() ), e); + ((Number) lhs).longValue(), ((Number) rhs).longValue() ), e ); } } // other numbers we cannot multiply @@ -252,11 +252,11 @@ public static Object modulo( Object lhs, Object rhs ) if ( lhs instanceof Number && rhs instanceof Number ) { - if ( lhs instanceof Double || rhs instanceof Double) + if ( lhs instanceof Double || rhs instanceof Double ) { return ((Number) lhs).doubleValue() % ((Number) rhs).doubleValue(); } - else if (lhs instanceof Float || rhs instanceof Float ) + else if ( lhs instanceof Float || rhs instanceof Float ) { return ((Number) lhs).floatValue() % ((Number) rhs).floatValue(); } diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/NodeIdWrapperImpl.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/NodeIdWrapperImpl.java index 6d251e6b1e2e6..7fc54317a5e85 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/NodeIdWrapperImpl.java +++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/NodeIdWrapperImpl.java @@ -40,9 +40,13 @@ public long id() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } NodeIdWrapper that = (NodeIdWrapper) o; diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/RelationshipIdWrapperImpl.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/RelationshipIdWrapperImpl.java index 2762899dc7ec2..bbfd67076abd3 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/RelationshipIdWrapperImpl.java +++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/RelationshipIdWrapperImpl.java @@ -40,9 +40,13 @@ public long id() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } RelationshipIdWrapperImpl that = (RelationshipIdWrapperImpl) o; diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/CommunityCypherEngineProvider.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/CommunityCypherEngineProvider.java index 5248247d653b8..5d462402ba3dc 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/CommunityCypherEngineProvider.java +++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/CommunityCypherEngineProvider.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.LogProvider; -@Service.Implementation(QueryEngineProvider.class) +@Service.Implementation( QueryEngineProvider.class ) public class CommunityCypherEngineProvider extends QueryEngineProvider { public CommunityCypherEngineProvider() @@ -60,6 +60,6 @@ protected QueryExecutionEngine createEngine( Dependencies deps, GraphDatabaseAPI CommunityCompatibilityFactory compatibilityFactory = new CommunityCompatibilityFactory( queryService, kernelAPI, monitors, logProvider ); deps.satisfyDependencies( compatibilityFactory ); - return new ExecutionEngine( queryService, logProvider, compatibilityFactory); + return new ExecutionEngine( queryService, logProvider, compatibilityFactory ); } } diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionResult.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionResult.java index bee0aecd510ce..899b1a7ce2a44 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionResult.java +++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionResult.java @@ -188,7 +188,7 @@ public PlanDescription executionPlanDescription() public void toString( PrintWriter writer ) { inner.dumpToString( writer ); // legacy method - don't convert exceptions... - for (Notification notification : scala.collection.JavaConversions.asJavaIterable( inner.notifications() )) + for ( Notification notification : scala.collection.JavaConversions.asJavaIterable( inner.notifications() ) ) { writer.println( notification.getDescription() ); } diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/DeleteRelationshipStressIT.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/DeleteRelationshipStressIT.java index e47fd30f6fbce..e54821c43117f 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/DeleteRelationshipStressIT.java +++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/DeleteRelationshipStressIT.java @@ -60,7 +60,7 @@ public void setup() { Node node = db.createNode( label( "L" ) ); - if (prev != null) + if ( prev != null ) { Relationship rel = prev.createRelationshipTo( node, DynamicRelationshipType.withName( "T" ) ); rel.setProperty( "prop", i + j ); diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/GraphDatabaseServiceExecuteTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/GraphDatabaseServiceExecuteTest.java index 742dff4e75cb7..eb1dfbc092453 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/GraphDatabaseServiceExecuteTest.java +++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/GraphDatabaseServiceExecuteTest.java @@ -256,7 +256,7 @@ public void shouldBeAbleToUseResultsOfPointGeometryProcedureAsInputToDistanceFun } - private static Point makeFakePoint(double x, double y, final CRS crs) + private static Point makeFakePoint( double x, double y, final CRS crs ) { final Coordinate coord = new Coordinate( x, y ); return new Point() @@ -282,7 +282,7 @@ public CRS getCRS() }; } - private static Geometry makeFakePointAsGeometry(double x, double y, final CRS crs) + private static Geometry makeFakePointAsGeometry( double x, double y, final CRS crs ) { final Coordinate coord = new Coordinate( x, y ); return new Geometry() @@ -339,13 +339,13 @@ public static class PointProcs public Stream spatialPoint( @Name( "longitude" ) double longitude, @Name( "latitude" ) double latitude ) { Point point = makeFakePoint( longitude, latitude, makeWGS84() ); - return Stream.of( new PointResult(point) ); + return Stream.of( new PointResult( point ) ); } @Procedure( "spatial.pointGeometry" ) public Stream spatialPointGeometry( @Name( "longitude" ) double longitude, @Name( "latitude" ) double latitude ) { Geometry geometry = makeFakePointAsGeometry( longitude, latitude, makeWGS84() ); - return Stream.of( new GeometryResult(geometry) ); + return Stream.of( new GeometryResult( geometry ) ); } } diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java index 0e18215cce43e..5192f2f324be8 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java +++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java @@ -40,7 +40,7 @@ import static java.lang.String.format; -@Ignore("Too costly to run by default but useful for testing resource clean up and indexing") +@Ignore( "Too costly to run by default but useful for testing resource clean up and indexing" ) public class ManyMergesStressTest { private Random random = new Random(); diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/export/ExportTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/export/ExportTest.java index cfecad55cf65c..6284729f3ad97 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/export/ExportTest.java +++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/export/ExportTest.java @@ -308,7 +308,7 @@ public void testFromPathCypherResult() throws Exception "create (_0)-[:`REL`]->(_1)" + lineSeparator() + ";" + lineSeparator(), doExportGraph( graph ) ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private ExecutionResult result( String column, Object value ) { ExecutionResult result = Mockito.mock( ExecutionResult.class ); diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/GraphImpl.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/GraphImpl.java index 8eb4a9ce6ef0a..f2b7b9eb999d7 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/GraphImpl.java +++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/GraphImpl.java @@ -31,7 +31,7 @@ public class GraphImpl implements Graph private final String[] value; - public GraphImpl(String[] value) + public GraphImpl( String[] value ) { this.value = value; diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/JavaValueCompatibilityTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/JavaValueCompatibilityTest.java index 841a136d03505..de2276fc95993 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/JavaValueCompatibilityTest.java +++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/JavaValueCompatibilityTest.java @@ -48,7 +48,7 @@ public void collections_in_collections_look_aiight() throws Exception { Result result = db.execute( "CREATE (n:TheNode) RETURN [[ [1,2],[3,4] ],[[5,6]]] as x" ); Map next = result.next(); - @SuppressWarnings("unchecked") //We know it's a collection. + @SuppressWarnings( "unchecked" ) //We know it's a collection. List> x = (List>)next.get( "x" ); Iterable objects = x.get( 0 ); diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/NotificationAcceptanceTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/NotificationAcceptanceTest.java index 333544b0c45d6..ce512510ba78a 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/NotificationAcceptanceTest.java +++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/NotificationAcceptanceTest.java @@ -24,6 +24,11 @@ import org.hamcrest.TypeSafeMatcher; import org.junit.Rule; import org.junit.Test; + +import java.util.Arrays; +import java.util.Map; +import java.util.stream.Stream; + import org.neo4j.graphdb.InputPosition; import org.neo4j.graphdb.Notification; import org.neo4j.graphdb.Result; @@ -32,11 +37,11 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.rule.ImpermanentDatabaseRule; -import java.util.Arrays; -import java.util.Map; -import java.util.stream.Stream; - -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.any; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; import static org.neo4j.graphdb.impl.notification.NotificationCode.CREATE_UNIQUE_UNAVAILABLE_FALLBACK; import static org.neo4j.graphdb.impl.notification.NotificationCode.RULE_PLANNER_UNAVAILABLE_FALLBACK; @@ -166,7 +171,7 @@ public void shouldWarnOnBindingVariableLengthRelationship() throws Exception private void assertNotifications( String query, Matcher> matchesExpectation ) { - try (Result result = db().execute( query ) ) + try ( Result result = db().execute( query ) ) { assertThat( result.getNotifications(), matchesExpectation ); } @@ -176,7 +181,7 @@ private Matcher notification( String code, Matcher description, Matcher position, - SeverityLevel severity) + SeverityLevel severity ) { return new TypeSafeMatcher() { diff --git a/community/dbms/src/main/java/org/neo4j/commandline/dbms/CannotWriteException.java b/community/dbms/src/main/java/org/neo4j/commandline/dbms/CannotWriteException.java index e22e77c45d27b..4ec992d9a130b 100644 --- a/community/dbms/src/main/java/org/neo4j/commandline/dbms/CannotWriteException.java +++ b/community/dbms/src/main/java/org/neo4j/commandline/dbms/CannotWriteException.java @@ -27,6 +27,6 @@ class CannotWriteException extends Exception { CannotWriteException( Path file ) { - super( format("Could not write to: %s", file.toAbsolutePath().toString() )); + super( format( "Could not write to: %s", file.toAbsolutePath().toString() ) ); } } diff --git a/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/path/DijkstraBidirectional.java b/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/path/DijkstraBidirectional.java index aefce27d2b1fc..b708d8b04d5c3 100644 --- a/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/path/DijkstraBidirectional.java +++ b/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/path/DijkstraBidirectional.java @@ -112,7 +112,7 @@ private Traverser traverser( Node start, final Node end, PathInterest interest ) final MutableDouble startSideShortest = new MutableDouble( 0 ); final MutableDouble endSideShortest = new MutableDouble( 0 ); PathExpander dijkstraExpander = new DijkstraBidirectionalPathExpander( expander, shortestSoFar, true, - startSideShortest, endSideShortest, epsilon); + startSideShortest, endSideShortest, epsilon ); GraphDatabaseService db = start.getGraphDatabase(); diff --git a/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/path/ShortestPath.java b/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/path/ShortestPath.java index 2d4c37ce14e71..c93b7a5e25dcd 100644 --- a/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/path/ShortestPath.java +++ b/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/path/ShortestPath.java @@ -251,7 +251,9 @@ else if ( stopAsap ) // to see if it finds a shorter path. (i.e. stop this side and freeze the depth). // but only if the other side has not stopped, otherwise we might miss shorter paths if ( otherSide.stop ) - { return; } + { + return; + } directionData.stop = true; } } diff --git a/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/DoubleComparator.java b/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/DoubleComparator.java index 6e903f4794e41..3f897b31103b0 100644 --- a/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/DoubleComparator.java +++ b/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/DoubleComparator.java @@ -23,7 +23,7 @@ public class DoubleComparator implements Comparator { - public int compare(Double o1, Double o2) + public int compare( Double o1, Double o2 ) { Double d = o1 - o2; return d > 0 ? 1 : (d < 0 ? -1 : 0); diff --git a/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/IntegerAdder.java b/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/IntegerAdder.java index 9a6ae6546a945..2c9533fa9feb5 100644 --- a/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/IntegerAdder.java +++ b/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/IntegerAdder.java @@ -23,7 +23,7 @@ public class IntegerAdder implements CostAccumulator { - public Integer addCosts(Integer c1, Integer c2) + public Integer addCosts( Integer c1, Integer c2 ) { return c1 + c2; } diff --git a/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/IntegerComparator.java b/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/IntegerComparator.java index 15cf7bb09b521..e71c0d106a316 100644 --- a/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/IntegerComparator.java +++ b/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/IntegerComparator.java @@ -23,7 +23,7 @@ public class IntegerComparator implements Comparator { - public int compare(Integer o1, Integer o2) + public int compare( Integer o1, Integer o2 ) { return o1 - o2; } diff --git a/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/IntegerEvaluator.java b/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/IntegerEvaluator.java index f5ae4de2d6fde..b421280e6d41f 100644 --- a/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/IntegerEvaluator.java +++ b/community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/util/IntegerEvaluator.java @@ -27,7 +27,7 @@ public class IntegerEvaluator implements CostEvaluator { private String costPropertyName; - public IntegerEvaluator( String costPropertyName) + public IntegerEvaluator( String costPropertyName ) { super(); this.costPropertyName = costPropertyName; diff --git a/community/graph-algo/src/test/java/org/neo4j/graphalgo/UtilTest.java b/community/graph-algo/src/test/java/org/neo4j/graphalgo/UtilTest.java index 97c0160774d72..fe760696fe7b6 100644 --- a/community/graph-algo/src/test/java/org/neo4j/graphalgo/UtilTest.java +++ b/community/graph-algo/src/test/java/org/neo4j/graphalgo/UtilTest.java @@ -19,20 +19,20 @@ */ package org.neo4j.graphalgo; -import static org.junit.Assert.assertTrue; +import common.Neo4jAlgoTestCase; +import org.junit.Test; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.junit.Test; import org.neo4j.graphalgo.impl.shortestpath.Util; import org.neo4j.graphalgo.impl.shortestpath.Util.PathCounter; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; -import common.Neo4jAlgoTestCase; +import static org.junit.Assert.assertTrue; public class UtilTest extends Neo4jAlgoTestCase { @@ -78,7 +78,7 @@ public void testPathCounter() assertTrue( counter.getNumberOfPathsToNode( e ) == 2 ); assertTrue( counter.getNumberOfPathsToNode( f ) == 3 ); // Reverse - counter = new Util.PathCounter( Util.reversedPredecessors( predecessors )); + counter = new Util.PathCounter( Util.reversedPredecessors( predecessors ) ); assertTrue( counter.getNumberOfPathsToNode( a ) == 3 ); assertTrue( counter.getNumberOfPathsToNode( b ) == 2 ); assertTrue( counter.getNumberOfPathsToNode( c ) == 1 ); diff --git a/community/graph-algo/src/test/java/org/neo4j/graphalgo/path/GeoDataGenerator.java b/community/graph-algo/src/test/java/org/neo4j/graphalgo/path/GeoDataGenerator.java index ad9d82434c348..22afad384c679 100644 --- a/community/graph-algo/src/test/java/org/neo4j/graphalgo/path/GeoDataGenerator.java +++ b/community/graph-algo/src/test/java/org/neo4j/graphalgo/path/GeoDataGenerator.java @@ -69,7 +69,7 @@ public GeoDataGenerator withMaxNeighborDistance( int maxDistance, double neighbo public void generate( File storeDir ) throws IOException { - try ( DefaultFileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction()) + try ( DefaultFileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction() ) { BatchInserter inserter = BatchInserters.inserter( storeDir.getAbsoluteFile(), fileSystem ); Grid grid = new Grid(); diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/DependencyResolver.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/DependencyResolver.java index 7ce3f3be1618f..09592a044a3f7 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/DependencyResolver.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/DependencyResolver.java @@ -52,7 +52,7 @@ public interface DependencyResolver */ T resolveDependency( Class type, SelectionStrategy selector ) throws IllegalArgumentException; - Supplier provideDependency( Class type, SelectionStrategy selector); + Supplier provideDependency( Class type, SelectionStrategy selector ); Supplier provideDependency( Class type ); @@ -101,7 +101,7 @@ public T resolveDependency( Class type ) throws IllegalArgumentException return resolveDependency( type, FIRST ); } - public Supplier provideDependency( final Class type, final SelectionStrategy selector) + public Supplier provideDependency( final Class type, final SelectionStrategy selector ) { return () -> resolveDependency( type, selector ); } diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/DynamicLabel.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/DynamicLabel.java index b1703ba916cef..349f87c2bc19b 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/DynamicLabel.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/DynamicLabel.java @@ -65,7 +65,7 @@ public String toString() } @Override - public boolean equals(Object other) + public boolean equals( Object other ) { return other instanceof Label && ((Label) other).name().equals( name ); } diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/InputPosition.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/InputPosition.java index 8600050c07464..f0da339728b46 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/InputPosition.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/InputPosition.java @@ -31,7 +31,7 @@ public final class InputPosition /** * The empty position */ - public static InputPosition empty = new InputPosition(-1, -1, -1); + public static InputPosition empty = new InputPosition( -1, -1, -1 ); /** * Creating a position from and offset, line number and a column number. @@ -77,16 +77,24 @@ public int getColumn() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } InputPosition that = (InputPosition) o; if ( offset != that.offset ) - { return false; } + { + return false; + } if ( line != that.line ) - { return false; } + { + return false; + } return column == that.column; } diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/InvalidTransactionTypeException.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/InvalidTransactionTypeException.java index cd90387a1b1f1..3c6e19c9e5cfd 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/InvalidTransactionTypeException.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/InvalidTransactionTypeException.java @@ -21,8 +21,8 @@ public class InvalidTransactionTypeException extends RuntimeException { - public InvalidTransactionTypeException(String message, Throwable cause) + public InvalidTransactionTypeException( String message, Throwable cause ) { - super(message, cause); + super( message, cause ); } } diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/NotInTransactionException.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/NotInTransactionException.java index 5eefc0896b591..4885e38b802b3 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/NotInTransactionException.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/NotInTransactionException.java @@ -28,8 +28,8 @@ public class NotInTransactionException extends RuntimeException { public NotInTransactionException() { - super("The requested operation cannot be performed, because it has to be performed in a transaction. " + - "Ensure you are wrapping your operation in the appropriate transaction boilerplate and try again."); + super( "The requested operation cannot be performed, because it has to be performed in a transaction. " + + "Ensure you are wrapping your operation in the appropriate transaction boilerplate and try again." ); } public NotInTransactionException( String message ) diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/PathExpanderBuilder.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/PathExpanderBuilder.java index 335496abcb163..9d1ea2d2824a9 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/PathExpanderBuilder.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/PathExpanderBuilder.java @@ -149,7 +149,7 @@ public PathExpanderBuilder addRelationshipFilter( Predicate the type of the object holding the state * @return a PathExpander produced from the configuration you have built up */ - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public PathExpander build() { return expander; diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/PathExpanders.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/PathExpanders.java index d310664a3a1f8..80f6423d2afd8 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/PathExpanders.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/PathExpanders.java @@ -39,7 +39,7 @@ public abstract class PathExpanders * @param the type of the object that holds the state * @return a very permissive {@link PathExpander} that follows any type in any direction */ - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static PathExpander allTypesAndDirections() { return StandardExpander.DEFAULT; @@ -52,7 +52,7 @@ public static PathExpander allTypesAndDirections() * @param the type of the object that holds the state * @return a very permissive {@link PathExpander} that follows {@code type} relationships in any direction */ - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static PathExpander forType( RelationshipType type ) { return StandardExpander.create( type, Direction.BOTH ); @@ -65,7 +65,7 @@ public static PathExpander forType( RelationshipType type ) * @param the type of the object that holds the state * @return a very permissive {@link PathExpander} that follows any type in {@code direction} */ - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static PathExpander forDirection( Direction direction ) { return StandardExpander.create( direction ); @@ -79,7 +79,7 @@ public static PathExpander forDirection( Direction direction ) * @param the type of the object that holds the state * @return a very restricted {@link PathExpander} that follows {@code type} in {@code direction} */ - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static PathExpander forTypeAndDirection( RelationshipType type, Direction direction ) { return StandardExpander.create( type, direction ); @@ -96,7 +96,7 @@ public static PathExpander forTypeAndDirection( RelationshipType * @param the type of the object that holds the state * @return a very restricted {@link PathExpander} that follows only the {@code type}/{@code direction} pairs that you list */ - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static PathExpander forTypesAndDirections( RelationshipType type1, Direction direction1, RelationshipType type2, Direction direction2, Object... more ) diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/config/InvalidSettingException.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/config/InvalidSettingException.java index becccc5f1f0a4..2696dadf1da5e 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/config/InvalidSettingException.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/config/InvalidSettingException.java @@ -27,12 +27,12 @@ public class InvalidSettingException extends RuntimeException public InvalidSettingException( String name, String value, String message ) { - super(String.format( "Bad value '%s' for setting '%s': %s", value, name, message )); + super( String.format( "Bad value '%s' for setting '%s': %s", value, name, message ) ); } public InvalidSettingException( String message ) { - super(message); + super( message ); } public InvalidSettingException( String message, Throwable cause ) diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/impl/traversal/BidirectionalTraversalBranchPath.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/impl/traversal/BidirectionalTraversalBranchPath.java index 6536569d263cd..fa815facbf72f 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/impl/traversal/BidirectionalTraversalBranchPath.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/impl/traversal/BidirectionalTraversalBranchPath.java @@ -102,7 +102,7 @@ private LinkedList gatherRelationships( TraversalBranch first, Tra branch = branch.parent(); } // We can might as well cache start node since we're right now there anyway - if ( cachedStartNode == null && first == start && branch.length() >= 0) + if ( cachedStartNode == null && first == start && branch.length() >= 0 ) { cachedStartNode = branch.endNode(); } @@ -141,7 +141,7 @@ private Iterable gatherNodes( TraversalBranch first, TraversalBranch then nodes.addFirst( branch.endNode() ); branch = branch.parent(); } - if ( cachedStartNode == null && first == start && branch.length() >= 0) + if ( cachedStartNode == null && first == start && branch.length() >= 0 ) { cachedStartNode = branch.endNode(); } @@ -159,7 +159,7 @@ private Iterable gatherNodes( TraversalBranch first, TraversalBranch then nodes.add( branch.endNode() ); } } - if ( cachedStartNode == null && then == start && branch.length() >= 0) + if ( cachedStartNode == null && then == start && branch.length() >= 0 ) { cachedStartNode = branch.endNode(); } diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/impl/traversal/StandardBranchCollisionDetector.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/impl/traversal/StandardBranchCollisionDetector.java index a46c54f3074d6..f26a7e351af78 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/impl/traversal/StandardBranchCollisionDetector.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/impl/traversal/StandardBranchCollisionDetector.java @@ -86,7 +86,7 @@ public Collection evaluate( TraversalBranch branch, Direction direction ) startPath, endPath ); if ( isAcceptablePath( path ) ) { - if (returnedPaths.add( path ) && includePath( path, startPath, endPath ) ) + if ( returnedPaths.add( path ) && includePath( path, startPath, endPath ) ) { foundPaths.add( path ); } diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/index/IndexPopulationProgress.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/index/IndexPopulationProgress.java index c6d7797ee77ef..ac47637ebcf86 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/index/IndexPopulationProgress.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/index/IndexPopulationProgress.java @@ -70,6 +70,6 @@ public long getTotalCount() @Override public String toString() { - return String.format( "%1.1f%%", getCompletedPercentage()); + return String.format( "%1.1f%%", getCompletedPercentage() ); } } diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/spatial/Coordinate.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/spatial/Coordinate.java index 9b971c0646ac6..79cd6692b84e7 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/spatial/Coordinate.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/spatial/Coordinate.java @@ -66,9 +66,13 @@ public List getCoordinate() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } Coordinate that = (Coordinate) o; diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/BidirectionalUniquenessFilter.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/BidirectionalUniquenessFilter.java index b06b86413c870..f96ba36533355 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/BidirectionalUniquenessFilter.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/BidirectionalUniquenessFilter.java @@ -34,5 +34,5 @@ public interface BidirectionalUniquenessFilter extends UniquenessFilter * @return {@code true} if the {@code path} fulfills the uniqueness contract, * otherwise {@code false}. */ - boolean checkFull(Path path); + boolean checkFull( Path path ); } diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/PathEvaluator.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/PathEvaluator.java index a40d335dde79c..40a7eb43ae22d 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/PathEvaluator.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/PathEvaluator.java @@ -58,7 +58,7 @@ public interface PathEvaluator extends Evaluator abstract class Adapter implements PathEvaluator { @Override - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public Evaluation evaluate( Path path ) { return evaluate( path, BranchState.NO_STATE ); diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/PathUnique.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/PathUnique.java index 8be85bbc0d9a8..93234221be835 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/PathUnique.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/PathUnique.java @@ -34,7 +34,7 @@ public boolean check( TraversalBranch source ) while ( source.length() > 0 ) { source = source.parent(); - if (type.idEquals(source, idToCompare)) + if ( type.idEquals( source, idToCompare ) ) { return false; } diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/RecentlyUnique.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/RecentlyUnique.java index d00783f592ac9..27a84fab9e05b 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/RecentlyUnique.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/RecentlyUnique.java @@ -36,8 +36,7 @@ class RecentlyUnique extends AbstractUniquenessFilter { super( type ); parameter = parameter != null ? parameter : DEFAULT_RECENT_SIZE; - recentlyVisited = new LruCache<>( "Recently visited", - ((Number) parameter).intValue() ); + recentlyVisited = new LruCache<>( "Recently visited", ((Number) parameter).intValue() ); } @Override 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 cc57ef87f8b2c..076df6e6d967c 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 @@ -151,7 +151,7 @@ enum Options TRIM_STRINGS( "trim-strings", org.neo4j.csv.reader.Configuration.DEFAULT.trimStrings(), "", - "Whether or not strings should be trimmed for whitespaces."), + "Whether or not strings should be trimmed for whitespaces." ), INPUT_ENCODING( "input-encoding", null, "", @@ -196,7 +196,7 @@ enum Options + "node input data. " + "Skipped nodes will be logged" + ", containing at most number of entites specified by " + BAD_TOLERANCE.key() + ", unless " - + "otherwise specified by " + SKIP_BAD_ENTRIES_LOGGING.key() + " option."), + + "otherwise specified by " + SKIP_BAD_ENTRIES_LOGGING.key() + " option." ), SKIP_DUPLICATE_NODES( "skip-duplicate-nodes", Boolean.FALSE, "", "Whether or not to skip importing nodes that have the same id/group. In the event of multiple " diff --git a/community/import-tool/src/test/java/org/neo4j/tooling/CsvOutput.java b/community/import-tool/src/test/java/org/neo4j/tooling/CsvOutput.java index 3764bbc3f9ea3..c068581f3d39e 100644 --- a/community/import-tool/src/test/java/org/neo4j/tooling/CsvOutput.java +++ b/community/import-tool/src/test/java/org/neo4j/tooling/CsvOutput.java @@ -53,7 +53,7 @@ public CsvOutput( File targetDirectory, Header nodeHeader, Header relationshipHe @Override public void doImport( Input input ) throws IOException { - consume( "nodes.csv", input.nodes(), nodeHeader, (node) -> + consume( "nodes.csv", input.nodes(), nodeHeader, ( node ) -> { deserialization.clear(); for ( Header.Entry entry : nodeHeader.entries() ) @@ -74,7 +74,7 @@ public void doImport( Input input ) throws IOException } return deserialization.materialize(); } ); - consume( "relationships.csv", input.relationships(), relationshipHeader, (relationship) -> + consume( "relationships.csv", input.relationships(), relationshipHeader, ( relationship ) -> { deserialization.clear(); for ( Header.Entry entry : relationshipHeader.entries() ) diff --git a/community/import-tool/src/test/java/org/neo4j/tooling/EntityDataGenerator.java b/community/import-tool/src/test/java/org/neo4j/tooling/EntityDataGenerator.java index 8e3e09d7234f2..5c48e46ad8bfc 100644 --- a/community/import-tool/src/test/java/org/neo4j/tooling/EntityDataGenerator.java +++ b/community/import-tool/src/test/java/org/neo4j/tooling/EntityDataGenerator.java @@ -44,11 +44,11 @@ public class EntityDataGenerator extends InputIterator.Adapter public EntityDataGenerator( Function generator, long count ) { this.sourceDescription = getClass().getSimpleName(); - BiFunction processor = (batch,ignore) -> generator.apply( batch ); + BiFunction processor = ( batch, ignore ) -> generator.apply( batch ); this.processing = new TicketedProcessing<>( getClass().getName(), Runtime.getRuntime().availableProcessors(), processor, () -> null ); this.processing.slurp( idRangeInput( count, Configuration.DEFAULT.batchSize() ), true ); - this.itemCursor = new ContinuableArrayCursor<>( () -> processing.next() ); + this.itemCursor = new ContinuableArrayCursor<>( processing::next ); } @Override diff --git a/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolTest.java b/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolTest.java index 0ce5450dfe28e..12ce0a2adeabe 100644 --- a/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolTest.java +++ b/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolTest.java @@ -67,6 +67,9 @@ import org.neo4j.unsafe.impl.batchimport.input.csv.Configuration; import org.neo4j.unsafe.impl.batchimport.input.csv.Type; +import static java.lang.String.format; +import static java.lang.System.currentTimeMillis; +import static java.util.Arrays.asList; import static org.apache.commons.lang3.StringUtils.repeat; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; @@ -75,11 +78,6 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - -import static java.lang.String.format; -import static java.lang.System.currentTimeMillis; -import static java.util.Arrays.asList; - import static org.neo4j.graphdb.Label.label; import static org.neo4j.graphdb.RelationshipType.withName; import static org.neo4j.helpers.ArrayUtil.join; @@ -1672,7 +1670,7 @@ public void shouldRespectDbConfig() throws Exception importTool( "--into", dbRule.getStoreDirAbsolutePath(), "--db-config", dbConfig.getAbsolutePath(), - "--nodes", nodeData( true, Configuration.COMMAS, nodeIds, (value) -> true ).getAbsolutePath() ); + "--nodes", nodeData( true, Configuration.COMMAS, nodeIds, ( value ) -> true ).getAbsolutePath() ); // THEN NeoStores stores = dbRule.getGraphDatabaseAPI().getDependencyResolver() diff --git a/community/index/src/main/java/org/neo4j/index/internal/gbptree/CrashGenerationCleaner.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/CrashGenerationCleaner.java index a5dd7a1effd9e..c92e70969561d 100644 --- a/community/index/src/main/java/org/neo4j/index/internal/gbptree/CrashGenerationCleaner.java +++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/CrashGenerationCleaner.java @@ -78,7 +78,7 @@ public void clean() throws IOException long startTime = currentTimeMillis(); int threads = availableProcessors; ExecutorService executor = Executors.newFixedThreadPool( threads ); - AtomicLong nextId = new AtomicLong( lowTreeNodeId); + AtomicLong nextId = new AtomicLong( lowTreeNodeId ); AtomicReference error = new AtomicReference<>(); AtomicInteger cleanedPointers = new AtomicInteger(); for ( int i = 0; i < threads; i++ ) diff --git a/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java index 1f65b72928fd5..dd15fb755930f 100644 --- a/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java +++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java @@ -185,7 +185,9 @@ default void startupState( boolean clean ) /** * No-op header reader. */ - static final Header.Reader NO_HEADER = (cursor,length) -> {}; + static final Header.Reader NO_HEADER = ( cursor, length ) -> + { + }; /** * Paged file in a {@link PageCache} providing the means of storage. diff --git a/community/index/src/main/java/org/neo4j/index/internal/gbptree/Header.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/Header.java index 4710644c1627b..b7a410cf36617 100644 --- a/community/index/src/main/java/org/neo4j/index/internal/gbptree/Header.java +++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/Header.java @@ -46,7 +46,7 @@ public interface Writer void write( PageCursor from, int length, PageCursor to ); } - static final Writer CARRY_OVER_PREVIOUS_HEADER = (from,length,to) -> + static final Writer CARRY_OVER_PREVIOUS_HEADER = ( from, length, to ) -> { int toOffset = to.getOffset(); from.copyTo( from.getOffset(), to, toOffset, length ); @@ -56,7 +56,7 @@ public interface Writer static Writer replace( Consumer writer ) { // Discard the previous state, just write the new - return (from,length,to) -> writer.accept( to ); + return ( from, length, to ) -> writer.accept( to ); } /** diff --git a/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeNode.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeNode.java index 41886c3b0e6b3..cbf880d9fd52e 100644 --- a/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeNode.java +++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeNode.java @@ -311,7 +311,7 @@ void setChildAt( PageCursor cursor, long child, int pos, long stableGeneration, writeChild( cursor, child, stableGeneration, unstableGeneration ); } - static void writeChild( PageCursor cursor, long child, long stableGeneration, long unstableGeneration) + static void writeChild( PageCursor cursor, long child, long stableGeneration, long unstableGeneration ) { GenerationSafePointerPair.write( cursor, child, stableGeneration, unstableGeneration ); } diff --git a/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeState.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeState.java index 6e27010b19f2e..2012865e60931 100644 --- a/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeState.java +++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeState.java @@ -286,22 +286,20 @@ public String toString() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } TreeState treeState = (TreeState) o; - return pageId == treeState.pageId && - stableGeneration == treeState.stableGeneration && - unstableGeneration == treeState.unstableGeneration && - rootId == treeState.rootId && - rootGeneration == treeState.rootGeneration && - lastId == treeState.lastId && + return pageId == treeState.pageId && stableGeneration == treeState.stableGeneration && + unstableGeneration == treeState.unstableGeneration && rootId == treeState.rootId && + rootGeneration == treeState.rootGeneration && lastId == treeState.lastId && freeListWritePageId == treeState.freeListWritePageId && - freeListReadPageId == treeState.freeListReadPageId && - freeListWritePos == treeState.freeListWritePos && - freeListReadPos == treeState.freeListReadPos && - clean == treeState.clean && - valid == treeState.valid; + freeListReadPageId == treeState.freeListReadPageId && freeListWritePos == treeState.freeListWritePos && + freeListReadPos == treeState.freeListReadPos && clean == treeState.clean && valid == treeState.valid; } @Override diff --git a/community/io/src/main/java/org/neo4j/io/fs/DefaultFileSystemAbstraction.java b/community/io/src/main/java/org/neo4j/io/fs/DefaultFileSystemAbstraction.java index 896fb93c2cc7b..6abd591cb6572 100644 --- a/community/io/src/main/java/org/neo4j/io/fs/DefaultFileSystemAbstraction.java +++ b/community/io/src/main/java/org/neo4j/io/fs/DefaultFileSystemAbstraction.java @@ -196,11 +196,7 @@ public void copyRecursively( File fromDirectory, File toDirectory ) throws IOExc public synchronized K getOrCreateThirdPartyFileSystem( Class clazz, Function, K> creator ) { - ThirdPartyFileSystem fileSystem = thirdPartyFileSystems.get( clazz ); - if (fileSystem == null) - { - thirdPartyFileSystems.put( clazz, fileSystem = creator.apply( clazz ) ); - } + ThirdPartyFileSystem fileSystem = thirdPartyFileSystems.computeIfAbsent( clazz, k -> creator.apply( clazz ) ); return clazz.cast( fileSystem ); } diff --git a/community/io/src/main/java/org/neo4j/io/fs/FileSystemLifecycleAdapter.java b/community/io/src/main/java/org/neo4j/io/fs/FileSystemLifecycleAdapter.java index aee02ac5eea80..57374559823c0 100644 --- a/community/io/src/main/java/org/neo4j/io/fs/FileSystemLifecycleAdapter.java +++ b/community/io/src/main/java/org/neo4j/io/fs/FileSystemLifecycleAdapter.java @@ -32,7 +32,7 @@ public class FileSystemLifecycleAdapter extends LifecycleAdapter { private FileSystemAbstraction fileSystemAbstraction; - public FileSystemLifecycleAdapter(FileSystemAbstraction fileSystemAbstraction) + public FileSystemLifecycleAdapter( FileSystemAbstraction fileSystemAbstraction ) { this.fileSystemAbstraction = fileSystemAbstraction; } diff --git a/community/io/src/main/java/org/neo4j/io/fs/FileUtils.java b/community/io/src/main/java/org/neo4j/io/fs/FileUtils.java index f4032d767ebc5..436a11716c0e4 100644 --- a/community/io/src/main/java/org/neo4j/io/fs/FileUtils.java +++ b/community/io/src/main/java/org/neo4j/io/fs/FileUtils.java @@ -279,7 +279,7 @@ public static void copyRecursively( File fromDirectory, File toDirectory ) throw copyRecursively( fromDirectory, toDirectory, null ); } - public static void copyRecursively( File fromDirectory, File toDirectory, FileFilter filter) throws IOException + public static void copyRecursively( File fromDirectory, File toDirectory, FileFilter filter ) throws IOException { for ( File fromFile : fromDirectory.listFiles( filter ) ) { @@ -313,12 +313,12 @@ public static void writeToFile( File target, String text, boolean append ) throw public static BufferedReader newBufferedFileReader( File file, Charset charset ) throws FileNotFoundException { - return new BufferedReader( new InputStreamReader( new FileInputStream( file ), charset) ); + return new BufferedReader( new InputStreamReader( new FileInputStream( file ), charset ) ); } public static PrintWriter newFilePrintWriter( File file, Charset charset ) throws FileNotFoundException { - return new PrintWriter( new OutputStreamWriter( new FileOutputStream( file, true ), charset) ); + return new PrintWriter( new OutputStreamWriter( new FileOutputStream( file, true ), charset ) ); } public static File path( String root, String... path ) @@ -466,7 +466,7 @@ private static void deleteFileWithRetries( Path file, int tries ) throws IOExcep { if ( tries >= WINDOWS_RETRY_COUNT ) { - throw new MaybeWindowsMemoryMappedFileReleaseProblem(e); + throw new MaybeWindowsMemoryMappedFileReleaseProblem( e ); } waitAndThenTriggerGC(); deleteFileWithRetries( file, tries + 1 ); @@ -483,14 +483,6 @@ private static boolean mayBeWindowsMemoryMappedFileReleaseProblem( IOException e return e.getMessage().contains( "The process cannot access the file because it is being used by another process." ); } - public static class MaybeWindowsMemoryMappedFileReleaseProblem extends IOException - { - public MaybeWindowsMemoryMappedFileReleaseProblem( IOException e ) - { - super(e); - } - } - /** * Given a directory and a path under it, return filename of the path * relative to the directory. @@ -622,4 +614,12 @@ public static OutputStream openAsOutputStream( Path path, boolean append ) throw } return Files.newOutputStream( path, options ); } + + public static class MaybeWindowsMemoryMappedFileReleaseProblem extends IOException + { + public MaybeWindowsMemoryMappedFileReleaseProblem( IOException e ) + { + super( e ); + } + } } diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/SingleFilePageSwapper.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/SingleFilePageSwapper.java index 74310b7ac2878..fd6d0c7cb461a 100644 --- a/community/io/src/main/java/org/neo4j/io/pagecache/impl/SingleFilePageSwapper.java +++ b/community/io/src/main/java/org/neo4j/io/pagecache/impl/SingleFilePageSwapper.java @@ -585,9 +585,13 @@ private long pageIdToPosition( long pageId ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } SingleFilePageSwapper that = (SingleFilePageSwapper) o; diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/DefaultPageCursorTracer.java b/community/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/DefaultPageCursorTracer.java index 3026ac6ab04f2..2671ec01ac7cb 100644 --- a/community/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/DefaultPageCursorTracer.java +++ b/community/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/DefaultPageCursorTracer.java @@ -52,15 +52,15 @@ public void init( PageCacheTracer pageCacheTracer ) public void reportEvents() { - if (pins > 0) + if ( pins > 0 ) { pageCacheTracer.pins( pins ); } - if (unpins > 0) + if ( unpins > 0 ) { pageCacheTracer.unpins( unpins ); } - if (hits > 0) + if ( hits > 0 ) { pageCacheTracer.hits( hits ); } diff --git a/community/io/src/test/java/org/neo4j/adversaries/AbstractAdversary.java b/community/io/src/test/java/org/neo4j/adversaries/AbstractAdversary.java index 386fe9f55150e..53a1753d90705 100644 --- a/community/io/src/test/java/org/neo4j/adversaries/AbstractAdversary.java +++ b/community/io/src/test/java/org/neo4j/adversaries/AbstractAdversary.java @@ -52,7 +52,7 @@ protected void throwOneOf( Class... types ) sneakyThrow( throwable ); } - public static void sneakyThrow(Throwable throwable) + public static void sneakyThrow( Throwable throwable ) { AbstractAdversary._sneakyThrow( throwable ); } diff --git a/community/io/src/test/java/org/neo4j/adversaries/ClassGuardedAdversary.java b/community/io/src/test/java/org/neo4j/adversaries/ClassGuardedAdversary.java index 8709a2c99f7da..0d8b09f102fa2 100644 --- a/community/io/src/test/java/org/neo4j/adversaries/ClassGuardedAdversary.java +++ b/community/io/src/test/java/org/neo4j/adversaries/ClassGuardedAdversary.java @@ -58,6 +58,6 @@ public boolean test( StackTraceElement stackTraceElement ) @SafeVarargs public ClassGuardedAdversary( Adversary delegate, Predicate... victims ) { - super(delegate, victims); + super( delegate, victims ); } } diff --git a/community/io/src/test/java/org/neo4j/adversaries/fs/AdversarialFileSystemAbstraction.java b/community/io/src/test/java/org/neo4j/adversaries/fs/AdversarialFileSystemAbstraction.java index 3b15beef84932..967a6fe9438d5 100644 --- a/community/io/src/test/java/org/neo4j/adversaries/fs/AdversarialFileSystemAbstraction.java +++ b/community/io/src/test/java/org/neo4j/adversaries/fs/AdversarialFileSystemAbstraction.java @@ -49,7 +49,7 @@ /** * Used by the robustness suite to check for partial failures. */ -@SuppressWarnings("unchecked") +@SuppressWarnings( "unchecked" ) public class AdversarialFileSystemAbstraction implements FileSystemAbstraction { private final FileSystemAbstraction delegate; @@ -199,7 +199,7 @@ public synchronized K getOrCreateThirdPartyFile Function, K> creator ) { ThirdPartyFileSystem fileSystem = thirdPartyFileSystems.get( clazz ); - if (fileSystem == null) + if ( fileSystem == null ) { fileSystem = creator.apply( clazz ); fileSystem = adversarialProxy( fileSystem, clazz ); diff --git a/community/io/src/test/java/org/neo4j/io/fs/FileSystemAbstractionInterruptionTest.java b/community/io/src/test/java/org/neo4j/io/fs/FileSystemAbstractionInterruptionTest.java index 287cb18194d66..5d7b1653b14b8 100644 --- a/community/io/src/test/java/org/neo4j/io/fs/FileSystemAbstractionInterruptionTest.java +++ b/community/io/src/test/java/org/neo4j/io/fs/FileSystemAbstractionInterruptionTest.java @@ -48,13 +48,10 @@ public class FileSystemAbstractionInterruptionTest private static final Factory ephemeral = EphemeralFileSystemAbstraction::new; private static final Factory real = DefaultFileSystemAbstraction::new; - @Parameterized.Parameters(name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static Iterable dataPoints() { - return Arrays.asList(new Object[][]{ - { "ephemeral", ephemeral }, - { "real", real } - }); + return Arrays.asList( new Object[][]{{"ephemeral", ephemeral}, {"real", real}} ); } @Rule @@ -125,61 +122,61 @@ public void ch_tryLock() throws IOException chan( false ).tryLock().release(); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_setPosition() throws IOException { chan( true ).position( 0 ); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_getPosition() throws IOException { chan( true ).position(); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_truncate() throws IOException { chan( true ).truncate( 0 ); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_force() throws IOException { chan( true ).force( true ); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_writeAll_ByteBuffer() throws IOException { chan( true ).writeAll( ByteBuffer.allocate( 1 ) ); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_writeAll_ByteBuffer_position() throws IOException { chan( true ).writeAll( ByteBuffer.allocate( 1 ), 1 ); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_write_ByteBuffer_position() throws IOException { chan( true ).write( ByteBuffer.allocate( 1 ), 1 ); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_read_ByteBuffer() throws IOException { chan( true ).read( ByteBuffer.allocate( 1 ) ); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_write_ByteBuffer() throws IOException { chan( true ).write( ByteBuffer.allocate( 1 ) ); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_size() throws IOException { chan( true ).size(); @@ -191,25 +188,25 @@ public void ch_isOpen() throws IOException chan( false ).isOpen(); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_write_ByteBuffers_offset_length() throws IOException { chan( true ).write( new ByteBuffer[]{ByteBuffer.allocate( 1 )}, 0, 1 ); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_write_ByteBuffers() throws IOException { chan( true ).write( new ByteBuffer[]{ByteBuffer.allocate( 1 )} ); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_read_ByteBuffers_offset_length() throws IOException { chan( true ).read( new ByteBuffer[]{ByteBuffer.allocate( 1 )}, 0, 1 ); } - @Test(expected = ClosedByInterruptException.class) + @Test( expected = ClosedByInterruptException.class ) public void ch_read_ByteBuffers() throws IOException { chan( true ).read( new ByteBuffer[]{ByteBuffer.allocate( 1 )} ); diff --git a/community/io/src/test/java/org/neo4j/io/fs/SelectiveFileSystemAbstractionTest.java b/community/io/src/test/java/org/neo4j/io/fs/SelectiveFileSystemAbstractionTest.java index 5dff4e18445f7..27f198213dd7f 100644 --- a/community/io/src/test/java/org/neo4j/io/fs/SelectiveFileSystemAbstractionTest.java +++ b/community/io/src/test/java/org/neo4j/io/fs/SelectiveFileSystemAbstractionTest.java @@ -40,7 +40,7 @@ public class SelectiveFileSystemAbstractionTest public void shouldUseCorrectFileSystemForChosenFile() throws Exception { // given - File specialFile = new File("special"); + File specialFile = new File( "special" ); FileSystemAbstraction normal = mock( FileSystemAbstraction.class ); FileSystemAbstraction special = mock( FileSystemAbstraction.class ); @@ -61,8 +61,8 @@ public void shouldUseCorrectFileSystemForChosenFile() throws Exception public void shouldUseDefaultFileSystemForOtherFiles() throws Exception { // given - File specialFile = new File("special"); - File otherFile = new File("other"); + File specialFile = new File( "special" ); + File otherFile = new File( "other" ); FileSystemAbstraction normal = mock( FileSystemAbstraction.class ); FileSystemAbstraction special = mock( FileSystemAbstraction.class ); @@ -84,8 +84,8 @@ public void shouldUseDefaultFileSystemForOtherFiles() throws Exception @Test public void provideSelectiveWatcher() throws IOException { - File specialFile = new File("special"); - File otherFile = new File("other"); + File specialFile = new File( "special" ); + File otherFile = new File( "other" ); FileSystemAbstraction normal = mock( FileSystemAbstraction.class ); FileSystemAbstraction special = mock( FileSystemAbstraction.class ); diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTest.java b/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTest.java index 4d64139ba4032..554ff6c39d9cf 100644 --- a/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTest.java +++ b/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTest.java @@ -1987,7 +1987,7 @@ public void writeUnlockMustInvalidateReadLocks() throws Exception } } - @Test( timeout = SHORT_TIMEOUT_MILLIS) + @Test( timeout = SHORT_TIMEOUT_MILLIS ) public void mustNotFlushCleanPagesWhenEvicting() throws Exception { generateFileWithRecords( file( "a" ), recordCount, recordSize ); @@ -3019,7 +3019,7 @@ private void verifyPageBounds( PageCursorAction action ) throws IOException } } - @Test(timeout = SHORT_TIMEOUT_MILLIS) + @Test( timeout = SHORT_TIMEOUT_MILLIS ) public void shouldRetryMustClearBoundsFlagWhenReturningTrue() throws Exception { configureStandardPageCache(); @@ -3040,7 +3040,7 @@ public void shouldRetryMustClearBoundsFlagWhenReturningTrue() throws Exception } } - @Test(timeout = SHORT_TIMEOUT_MILLIS) + @Test( timeout = SHORT_TIMEOUT_MILLIS ) public void shouldRetryMustNotClearBoundsFlagWhenReturningFalse() throws Exception { configureStandardPageCache(); @@ -3061,7 +3061,7 @@ public void shouldRetryMustNotClearBoundsFlagWhenReturningFalse() throws Excepti } } - @Test(timeout = SHORT_TIMEOUT_MILLIS) + @Test( timeout = SHORT_TIMEOUT_MILLIS ) public void nextThatReturnsTrueMustNotClearBoundsFlagOnReadCursor() throws Exception { configureStandardPageCache(); @@ -3082,7 +3082,7 @@ public void nextThatReturnsTrueMustNotClearBoundsFlagOnReadCursor() throws Excep } } - @Test(timeout = SHORT_TIMEOUT_MILLIS) + @Test( timeout = SHORT_TIMEOUT_MILLIS ) public void nextThatReturnsTrueMustNotClearBoundsFlagOnWriteCursor() throws Exception { configureStandardPageCache(); @@ -3098,7 +3098,7 @@ public void nextThatReturnsTrueMustNotClearBoundsFlagOnWriteCursor() throws Exce } } - @Test(timeout = SHORT_TIMEOUT_MILLIS) + @Test( timeout = SHORT_TIMEOUT_MILLIS ) public void nextThatReturnsFalseMustNotClearBoundsFlagOnReadCursor() throws Exception { configureStandardPageCache(); @@ -3119,7 +3119,7 @@ public void nextThatReturnsFalseMustNotClearBoundsFlagOnReadCursor() throws Exce } } - @Test(timeout = SHORT_TIMEOUT_MILLIS) + @Test( timeout = SHORT_TIMEOUT_MILLIS ) public void nextThatReturnsFalseMustNotClearBoundsFlagOnWriteCursor() throws Exception { File file = file( "a" ); @@ -3137,7 +3137,7 @@ public void nextThatReturnsFalseMustNotClearBoundsFlagOnWriteCursor() throws Exc } } - @Test(timeout = SHORT_TIMEOUT_MILLIS) + @Test( timeout = SHORT_TIMEOUT_MILLIS ) public void nextWithPageIdThatReturnsTrueMustNotClearBoundsFlagOnReadCursor() throws Exception { configureStandardPageCache(); @@ -3158,7 +3158,7 @@ public void nextWithPageIdThatReturnsTrueMustNotClearBoundsFlagOnReadCursor() th } } - @Test(timeout = SHORT_TIMEOUT_MILLIS) + @Test( timeout = SHORT_TIMEOUT_MILLIS ) public void nextWithPageIdMustNotClearBoundsFlagOnWriteCursor() throws Exception { configureStandardPageCache(); @@ -3817,7 +3817,7 @@ public void mustSyncDeviceWhenFlushAndForcingPageCache() throws Exception } } - @Test(expected = NoSuchFileException.class) + @Test( expected = NoSuchFileException.class ) public void mustThrowWhenMappingNonExistingFile() throws Exception { configureStandardPageCache(); @@ -3829,7 +3829,7 @@ public void mustCreateNonExistingFileWithCreateOption() throws Exception { configureStandardPageCache(); try ( PagedFile pf = pageCache.map( file( "does not exist" ), filePageSize, StandardOpenOption.CREATE ); - PageCursor cursor = pf.io( 0, PF_SHARED_WRITE_LOCK )) + PageCursor cursor = pf.io( 0, PF_SHARED_WRITE_LOCK ) ) { assertTrue( cursor.next() ); } @@ -3840,7 +3840,7 @@ public void mustIgnoreCreateOptionIfFileAlreadyExists() throws Exception { configureStandardPageCache(); try ( PagedFile pf = pageCache.map( file( "a" ), filePageSize, StandardOpenOption.CREATE ); - PageCursor cursor = pf.io( 0, PF_SHARED_WRITE_LOCK )) + PageCursor cursor = pf.io( 0, PF_SHARED_WRITE_LOCK ) ) { assertTrue( cursor.next() ); } @@ -3853,7 +3853,7 @@ public void mustIgnoreCertainOpenOptions() throws Exception try ( PagedFile pf = pageCache.map( file( "a" ), filePageSize, StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.APPEND, StandardOpenOption.SPARSE ); - PageCursor cursor = pf.io( 0, PF_SHARED_WRITE_LOCK )) + PageCursor cursor = pf.io( 0, PF_SHARED_WRITE_LOCK ) ) { assertTrue( cursor.next() ); } @@ -5104,7 +5104,7 @@ public void streamFilesRecursiveMustNotListSubDirectories() throws Exception configureStandardPageCache(); File sub1 = existingDirectory( "sub1" ); File sub2 = existingDirectory( "sub2" ); - File sub2sub1 = new File( sub2, "sub1"); + File sub2sub1 = new File( sub2, "sub1" ); ensureDirectoryExists( sub2sub1 ); existingDirectory( "sub3" ); // must not be observed in the stream File a = existingFile( "a" ); diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/impl/ByteBufferPage.java b/community/io/src/test/java/org/neo4j/io/pagecache/impl/ByteBufferPage.java index f2dc535b50ea5..8d2924660f86d 100644 --- a/community/io/src/test/java/org/neo4j/io/pagecache/impl/ByteBufferPage.java +++ b/community/io/src/test/java/org/neo4j/io/pagecache/impl/ByteBufferPage.java @@ -96,7 +96,7 @@ public void putInt( int value, int offset ) public void getBytes( byte[] data, int pageOffset, int arrayOffset, int length ) { - for (int i = 0; i < length; i++) + for ( int i = 0; i < length; i++ ) { data[arrayOffset + i] = getByte( pageOffset + i ); } @@ -104,7 +104,7 @@ public void getBytes( byte[] data, int pageOffset, int arrayOffset, int length ) public void putBytes( byte[] data, int pageOffset, int arrayOffset, int length ) { - for (int i = 0; i < length; i++) + for ( int i = 0; i < length; i++ ) { putByte( data[arrayOffset + i], pageOffset + i ); } diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/randomharness/PageCountRecordFormat.java b/community/io/src/test/java/org/neo4j/io/pagecache/randomharness/PageCountRecordFormat.java index c122a12542d25..e12e2a7e9d095 100644 --- a/community/io/src/test/java/org/neo4j/io/pagecache/randomharness/PageCountRecordFormat.java +++ b/community/io/src/test/java/org/neo4j/io/pagecache/randomharness/PageCountRecordFormat.java @@ -116,9 +116,13 @@ public byte getRecordId() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } PageCountRecord that = (PageCountRecord) o; diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/randomharness/StandardRecordFormat.java b/community/io/src/test/java/org/neo4j/io/pagecache/randomharness/StandardRecordFormat.java index acec925801f8a..33cfa2172c612 100644 --- a/community/io/src/test/java/org/neo4j/io/pagecache/randomharness/StandardRecordFormat.java +++ b/community/io/src/test/java/org/neo4j/io/pagecache/randomharness/StandardRecordFormat.java @@ -123,17 +123,18 @@ static final class StandardRecord implements Record public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } StandardRecord record = (StandardRecord) o; - return type == record.type - && recordId == record.recordId - && fill1 == record.fill1 - && fill2 == record.fill2 - && filesEqual( record ); + return type == record.type && recordId == record.recordId && fill1 == record.fill1 && + fill2 == record.fill2 && filesEqual( record ); } diff --git a/community/io/src/test/java/org/neo4j/test/impl/ChannelInputStream.java b/community/io/src/test/java/org/neo4j/test/impl/ChannelInputStream.java index 6988f36edcc57..e6b322347f839 100644 --- a/community/io/src/test/java/org/neo4j/test/impl/ChannelInputStream.java +++ b/community/io/src/test/java/org/neo4j/test/impl/ChannelInputStream.java @@ -41,7 +41,7 @@ public int read() throws IOException { buffer.clear(); buffer.limit( 1 ); - while ( buffer.hasRemaining()) + while ( buffer.hasRemaining() ) { int read = channel.read( buffer ); diff --git a/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java b/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java index ea0650b68d159..242d4055dbb54 100644 --- a/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java +++ b/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java @@ -250,9 +250,9 @@ public File prepareDirectoryForTest( String test ) throws IOException private void evaluateClassBaseTestFolder( ) { - if (owningTest == null) + if ( owningTest == null ) { - throw new IllegalStateException(" Test owning class is not defined" ); + throw new IllegalStateException( " Test owning class is not defined" ); } try { diff --git a/community/jmx/src/main/java/org/neo4j/jmx/JmxUtils.java b/community/jmx/src/main/java/org/neo4j/jmx/JmxUtils.java index ec6bc8651ffd3..8e0955f532309 100644 --- a/community/jmx/src/main/java/org/neo4j/jmx/JmxUtils.java +++ b/community/jmx/src/main/java/org/neo4j/jmx/JmxUtils.java @@ -56,7 +56,7 @@ public static ObjectName getObjectName( GraphDatabaseService db, String name ) } } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static T getAttribute( ObjectName objectName, String attribute ) { try @@ -69,7 +69,7 @@ public static T getAttribute( ObjectName objectName, String attribute ) } } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static T invoke( ObjectName objectName, String attribute, Object[] params, String[] signatur ) { try diff --git a/community/jmx/src/main/java/org/neo4j/jmx/impl/JmxExtensionFactory.java b/community/jmx/src/main/java/org/neo4j/jmx/impl/JmxExtensionFactory.java index bdbb5ef72261d..d09c0823ea891 100644 --- a/community/jmx/src/main/java/org/neo4j/jmx/impl/JmxExtensionFactory.java +++ b/community/jmx/src/main/java/org/neo4j/jmx/impl/JmxExtensionFactory.java @@ -20,13 +20,13 @@ package org.neo4j.jmx.impl; import org.neo4j.helpers.Service; -import org.neo4j.kernel.internal.KernelData; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.logging.LogService; import org.neo4j.kernel.impl.spi.KernelContext; +import org.neo4j.kernel.internal.KernelData; import org.neo4j.kernel.lifecycle.Lifecycle; -@Service.Implementation(KernelExtensionFactory.class) +@Service.Implementation( KernelExtensionFactory.class ) public final class JmxExtensionFactory extends KernelExtensionFactory { public interface Dependencies diff --git a/community/jmx/src/main/java/org/neo4j/jmx/impl/StoreFileBean.java b/community/jmx/src/main/java/org/neo4j/jmx/impl/StoreFileBean.java index 6b5117d102553..48efa48480b68 100644 --- a/community/jmx/src/main/java/org/neo4j/jmx/impl/StoreFileBean.java +++ b/community/jmx/src/main/java/org/neo4j/jmx/impl/StoreFileBean.java @@ -21,7 +21,6 @@ import java.io.File; import java.io.IOException; - import javax.management.NotCompliantMBeanException; import org.neo4j.helpers.Service; @@ -30,7 +29,7 @@ import org.neo4j.kernel.impl.transaction.log.LogFile; import org.neo4j.kernel.impl.transaction.state.DataSourceManager; -@Service.Implementation(ManagementBeanProvider.class) +@Service.Implementation( ManagementBeanProvider.class ) public final class StoreFileBean extends ManagementBeanProvider { public StoreFileBean() diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactoryState.java b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactoryState.java index 9e1bd2897c0d5..f8510f7cf612c 100644 --- a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactoryState.java +++ b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactoryState.java @@ -109,7 +109,7 @@ public void setUserLogProvider( LogProvider userLogProvider ) this.userLogProvider = userLogProvider; } - public void setMonitors(Monitors monitors) + public void setMonitors( Monitors monitors ) { this.monitors = monitors; } diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java index 14072b4ebcf21..9213791bd25e3 100644 --- a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java +++ b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java @@ -87,41 +87,43 @@ public class GraphDatabaseSettings implements LoadableConfig // default unspecified transaction timeout public static final long UNSPECIFIED_TIMEOUT = 0L; - @SuppressWarnings("unused") // accessed by reflection + @SuppressWarnings( "unused" ) // accessed by reflection @Migrator private static final ConfigurationMigrator migrator = new GraphDatabaseConfigurationMigrator(); @Internal - @Description("Root relative to which directory settings are resolved. This is set in code and should never be " + - "configured explicitly.") + @Description( "Root relative to which directory settings are resolved. This is set in code and should never be " + + "configured explicitly." ) public static final Setting neo4j_home = setting( "unsupported.dbms.directories.neo4j_home", PATH, NO_DEFAULT ); - @Title("Read only database") - @Description("Only allow read operations from this Neo4j instance. " + - "This mode still requires write access to the directory for lock purposes.") + @Title( "Read only database" ) + @Description( "Only allow read operations from this Neo4j instance. " + + "This mode still requires write access to the directory for lock purposes." ) public static final Setting read_only = setting( "dbms.read_only", BOOLEAN, FALSE ); - @Title("Disconnected") + @Title( "Disconnected" ) @Internal - @Description("Disable all protocol connectors.") + @Description( "Disable all protocol connectors." ) public static final Setting disconnected = setting( "unsupported.dbms.disconnected", BOOLEAN, FALSE ); - @Description("Print out the effective Neo4j configuration after startup.") + @Description( "Print out the effective Neo4j configuration after startup." ) @Internal - public static final Setting dump_configuration = setting("unsupported.dbms.report_configuration", BOOLEAN, FALSE ); + public static final Setting dump_configuration = setting( "unsupported.dbms.report_configuration", + BOOLEAN, FALSE ); @Description( "A strict configuration validation will prevent the database from starting up if unknown " + "configuration options are specified in the neo4j settings namespace (such as dbms., ha., cypher., etc). " + "This is currently false by default but will be true by default in 4.0." ) public static final Setting strict_config_validation = - setting("dbms.config.strict_validation", BOOLEAN, FALSE ); + setting( "dbms.config.strict_validation", BOOLEAN, FALSE ); - @Description("Whether to allow a store upgrade in case the current version of the database starts against an " + + @Description( "Whether to allow a store upgrade in case the current version of the database starts against an " + "older store version. " + "Setting this to `true` does not guarantee successful upgrade, it just " + - "allows an upgrade to be performed.") - public static final Setting allow_store_upgrade = setting("dbms.allow_format_migration", BOOLEAN, FALSE ); + "allows an upgrade to be performed." ) + public static final Setting allow_store_upgrade = setting( "dbms.allow_format_migration", BOOLEAN, + FALSE ); @Description( "Database record format. Enterprise edition only. Valid values: `standard`, `high_limit`. " + "Default value: `standard`." ) @@ -132,7 +134,7 @@ public class GraphDatabaseSettings implements LoadableConfig @Description( "Set this to specify the default parser (language version)." ) public static final Setting cypher_parser_version = setting( "cypher.default_language_version", - options("2.3", "3.1", "3.2", DEFAULT ), DEFAULT ); + options( "2.3", "3.1", "3.2", DEFAULT ), DEFAULT ); @Description( "Set this to specify the default planner for the default language version." ) public static final Setting cypher_planner = setting( @@ -214,7 +216,7 @@ public class GraphDatabaseSettings implements LoadableConfig public static Setting cypher_idp_solver_duration_threshold = setting( "unsupported.cypher.idp_solver_duration_threshold", LONG, "1000", min( 10L ) ); - @Description("The minimum lifetime of a query plan before a query is considered for replanning") + @Description( "The minimum lifetime of a query plan before a query is considered for replanning" ) public static Setting cypher_min_replan_interval = setting( "cypher.min_replan_interval", DURATION, "10s" ); @Description( "Determines if Cypher will allow using file URLs when loading data using `LOAD CSV`. Setting this " @@ -244,9 +246,10 @@ public class GraphDatabaseSettings implements LoadableConfig @Description( "Please use dbms.transaction.timeout instead." ) @Deprecated @ReplacedBy( "dbms.transaction.timeout" ) - public static final Setting execution_guard_enabled = setting("unsupported.dbms.executiontime_limit.enabled", BOOLEAN, FALSE ); + public static final Setting execution_guard_enabled = + setting( "unsupported.dbms.executiontime_limit.enabled", BOOLEAN, FALSE ); - @Description("The maximum time interval of a transaction within which it should be completed.") + @Description( "The maximum time interval of a transaction within which it should be completed." ) public static final Setting transaction_timeout = setting( "dbms.transaction.timeout", DURATION, String.valueOf( UNSPECIFIED_TIMEOUT ) ); @Description( "The maximum time interval within which lock should be acquired." ) @@ -258,19 +261,20 @@ public class GraphDatabaseSettings implements LoadableConfig public static final Setting shutdown_transaction_end_timeout = setting( "dbms.shutdown_transaction_end_timeout", DURATION, "10s" ); - @Description("Location of the database plugin directory. Compiled Java JAR files that contain database " + - "procedures will be loaded if they are placed in this directory.") + @Description( "Location of the database plugin directory. Compiled Java JAR files that contain database " + + "procedures will be loaded if they are placed in this directory." ) public static final Setting plugin_dir = pathSetting( "dbms.directories.plugins", "plugins" ); @Description( "Threshold for rotation of the debug log." ) - public static final Setting store_internal_log_rotation_threshold = setting("dbms.logs.debug.rotation.size", BYTES, "20m", min(0L), max( Long.MAX_VALUE ) ); + public static final Setting store_internal_log_rotation_threshold = + setting( "dbms.logs.debug.rotation.size", BYTES, "20m", min(0L), max( Long.MAX_VALUE ) ); @Description( "Debug log contexts that should output debug level logging" ) @Internal public static final Setting> store_internal_debug_contexts = setting( "unsupported.dbms.logs.debug.debug_loggers", list( ",", STRING ), "org.neo4j.diagnostics,org.neo4j.cluster.protocol,org.neo4j.kernel.ha" ); - @Description("Debug log level threshold.") + @Description( "Debug log level threshold." ) public static final Setting store_internal_log_level = setting( "dbms.logs.debug.level", options( Level.class ), "INFO" ); @@ -281,10 +285,11 @@ public class GraphDatabaseSettings implements LoadableConfig @Description( "Minimum time interval after last rotation of the debug log before it may be rotated again." ) public static final Setting store_internal_log_rotation_delay = - setting("dbms.logs.debug.rotation.delay", DURATION, "300s" ); + setting( "dbms.logs.debug.rotation.delay", DURATION, "300s" ); @Description( "Maximum number of history files for the debug log." ) - public static final Setting store_internal_log_max_archives = setting("dbms.logs.debug.rotation.keep_number", INTEGER, "7", min(1) ); + public static final Setting store_internal_log_max_archives = + setting( "dbms.logs.debug.rotation.keep_number", INTEGER, "7", min(1) ); @Description( "Configures the transaction interval between check-points. The database will not check-point more " + "often than this (unless check pointing is triggered by a different event), but might check-point " + @@ -317,60 +322,66 @@ public class GraphDatabaseSettings implements LoadableConfig "A lower number means lower IO pressure, and consequently longer checkpoint times. " + "The configuration can also be commented out to remove the limitation entirely, and " + "let the checkpointer flush data as fast as the hardware will go. " + - "Set this to -1 to disable the IOPS limit.") + "Set this to -1 to disable the IOPS limit." ) public static final Setting check_point_iops_limit = setting( "dbms.checkpoint.iops.limit", INTEGER, "300" ); // Auto Indexing - @Description("Controls the auto indexing feature for nodes. Setting it to `false` shuts it down, " + - "while `true` enables it by default for properties listed in the dbms.auto_index.nodes.keys setting.") + @Description( "Controls the auto indexing feature for nodes. Setting it to `false` shuts it down, " + + "while `true` enables it by default for properties listed in the dbms.auto_index.nodes.keys setting." ) @Internal @Deprecated - public static final Setting node_auto_indexing = setting("dbms.auto_index.nodes.enabled", BOOLEAN, FALSE); + public static final Setting node_auto_indexing = setting( "dbms.auto_index.nodes.enabled", BOOLEAN, + FALSE); - @Description("A list of property names (comma separated) that will be indexed by default. This applies to _nodes_ " + - "only.") + @Description( "A list of property names (comma separated) that will be indexed by default. This applies to " + + "_nodes_ only." ) @Internal @Deprecated - public static final Setting> node_keys_indexable = setting("dbms.auto_index.nodes.keys", STRING_LIST, "" ); + public static final Setting> node_keys_indexable = setting( "dbms.auto_index.nodes.keys", + STRING_LIST, "" ); - @Description("Controls the auto indexing feature for relationships. Setting it to `false` shuts it down, " + - "while `true` enables it by default for properties listed in the dbms.auto_index.relationships.keys setting.") + @Description( "Controls the auto indexing feature for relationships. Setting it to `false` shuts it down, " + + "while `true` enables it by default for properties listed in the dbms.auto_index.relationships.keys " + + "setting." ) @Internal @Deprecated public static final Setting relationship_auto_indexing = - setting("dbms.auto_index.relationships.enabled", BOOLEAN, FALSE ); + setting( "dbms.auto_index.relationships.enabled", BOOLEAN, FALSE ); - @Description("A list of property names (comma separated) that will be indexed by default. This applies to " + + @Description( "A list of property names (comma separated) that will be indexed by default. This applies to " + "_relationships_ only." ) @Internal @Deprecated - public static final Setting> relationship_keys_indexable = setting("dbms.auto_index.relationships.keys", STRING_LIST, "" ); + public static final Setting> relationship_keys_indexable = + setting( "dbms.auto_index.relationships.keys", STRING_LIST, "" ); // Index sampling - @Description("Enable or disable background index sampling") + @Description( "Enable or disable background index sampling" ) public static final Setting index_background_sampling_enabled = - setting("dbms.index_sampling.background_enabled", BOOLEAN, TRUE ); + setting( "dbms.index_sampling.background_enabled", BOOLEAN, TRUE ); - @Description("Size of buffer used by index sampling. " + + @Description( "Size of buffer used by index sampling. " + "This configuration setting is no longer applicable as from Neo4j 3.0.3. " + - "Please use dbms.index_sampling.sample_size_limit instead.") + "Please use dbms.index_sampling.sample_size_limit instead." ) @Deprecated @ReplacedBy( "dbms.index_sampling.sample_size_limit" ) - public static final Setting index_sampling_buffer_size = setting("dbms.index_sampling.buffer_size", BYTES, "64m", - min( /* 1m */ 1048576L ), max( (long) Integer.MAX_VALUE ) ); + public static final Setting index_sampling_buffer_size = setting( "dbms.index_sampling.buffer_size", + BYTES, "64m", min( /* 1m */ 1048576L ), max( (long) Integer.MAX_VALUE ) ); - @Description("Index sampling chunk size limit") - public static final Setting index_sample_size_limit = setting("dbms.index_sampling.sample_size_limit", + @Description( "Index sampling chunk size limit" ) + public static final Setting index_sample_size_limit = setting( "dbms.index_sampling.sample_size_limit", INTEGER, String.valueOf( ByteUnit.mebiBytes( 8 ) ), min( (int) ByteUnit.mebiBytes( 1 ) ), max( Integer.MAX_VALUE ) ); - @Description("Percentage of index updates of total index size required before sampling of a given index is triggered") + @Description( "Percentage of index updates of total index size required before sampling of a given index is " + + "triggered" ) public static final Setting index_sampling_update_percentage = - setting("dbms.index_sampling.update_percentage", INTEGER, "5", min( 0 ) ); + setting( "dbms.index_sampling.update_percentage", INTEGER, "5", min( 0 ) ); // Lucene settings @Description( "The maximum number of open Lucene index searchers." ) - public static Setting lucene_searcher_cache_size = setting("dbms.index_searcher_cache_size",INTEGER, Integer.toString( Integer.MAX_VALUE ), min( 1 )); + public static Setting lucene_searcher_cache_size = setting( "dbms.index_searcher_cache_size",INTEGER, + Integer.toString( Integer.MAX_VALUE ), min( 1 )); // Lucene schema indexes @Internal @@ -378,11 +389,12 @@ public class GraphDatabaseSettings implements LoadableConfig setting( "unsupported.dbms.multi_threaded_schema_index_population_enabled", BOOLEAN, TRUE ); // Store settings - @Description("Make Neo4j keep the logical transaction logs for being able to backup the database. " + + @Description( "Make Neo4j keep the logical transaction logs for being able to backup the database. " + "Can be used for specifying the threshold to prune logical logs after. For example \"10 days\" will " + "prune logical logs that only contains transactions older than 10 days from the current time, " + - "or \"100k txs\" will keep the 100k latest transactions and prune any older transactions.") - public static final Setting keep_logical_logs = setting("dbms.tx_log.rotation.retention_policy", STRING, "7 days", illegalValueMessage( "must be `true`/`false` or of format ' ' for example `100M size` for " + + "or \"100k txs\" will keep the 100k latest transactions and prune any older transactions." ) + public static final Setting keep_logical_logs = setting( "dbms.tx_log.rotation.retention_policy", + STRING, "7 days", illegalValueMessage( "must be `true`/`false` or of format ' ' for example `100M size` for " + "limiting logical log space on disk to 100Mb," + " or `200k txs` for limiting the number of transactions to keep to 200 000", matches(ANY))); @@ -390,14 +402,15 @@ public class GraphDatabaseSettings implements LoadableConfig "`0` means that no rotation will automatically occur based on file size. " ) public static final Setting logical_log_rotation_threshold = setting( "dbms.tx_log.rotation.size", BYTES, "250M", min( 1024 * 1024L /*1Mb*/ ) ); - @Description("Use a quick approach for rebuilding the ID generators. This give quicker recovery time, " + - "but will limit the ability to reuse the space of deleted entities.") + @Description( "Use a quick approach for rebuilding the ID generators. This give quicker recovery time, " + + "but will limit the ability to reuse the space of deleted entities." ) @Internal - public static final Setting rebuild_idgenerators_fast = setting("unsupported.dbms.id_generator_fast_rebuild_enabled", BOOLEAN, TRUE ); + public static final Setting rebuild_idgenerators_fast = + setting( "unsupported.dbms.id_generator_fast_rebuild_enabled", BOOLEAN, TRUE ); // Store memory settings - @Description("Target size for pages of mapped memory. If set to 0, then a reasonable default is chosen, " + - "depending on the storage device used.") + @Description( "Target size for pages of mapped memory. If set to 0, then a reasonable default is chosen, " + + "depending on the storage device used." ) @Internal @Deprecated public static final Setting mapped_memory_page_size = setting( "unsupported.dbms.memory.pagecache.pagesize", BYTES, "0" ); @@ -423,46 +436,46 @@ public class GraphDatabaseSettings implements LoadableConfig * As soon as we will figure it out properties will be re-evaluated and overwritten, except cases of user * defined value. */ - @Description("Specifies the block size for storing strings. This parameter is only honored when the store is " + + @Description( "Specifies the block size for storing strings. This parameter is only honored when the store is " + "created, otherwise it is ignored. " + "Note that each character in a string occupies two bytes, meaning that e.g a block size of 120 will hold " + "a 60 character long string before overflowing into a second block. " + "Also note that each block carries a ~10B of overhead so record size on disk will be slightly larger " + "than the configured block size" ) @Internal - public static final Setting string_block_size = setting("unsupported.dbms.block_size.strings", INTEGER, + public static final Setting string_block_size = setting( "unsupported.dbms.block_size.strings", INTEGER, "0", min( 0 ) ); - @Description("Specifies the block size for storing arrays. This parameter is only honored when the store is " + + @Description( "Specifies the block size for storing arrays. This parameter is only honored when the store is " + "created, otherwise it is ignored. " + "Also note that each block carries a ~10B of overhead so record size on disk will be slightly larger " + "than the configured block size" ) @Internal - public static final Setting array_block_size = setting("unsupported.dbms.block_size.array_properties", INTEGER, - "0", min( 0 ) ); + public static final Setting array_block_size = setting( "unsupported.dbms.block_size.array_properties", + INTEGER, "0", min( 0 ) ); - @Description("Specifies the block size for storing labels exceeding in-lined space in node record. " + + @Description( "Specifies the block size for storing labels exceeding in-lined space in node record. " + "This parameter is only honored when the store is created, otherwise it is ignored. " + "Also note that each block carries a ~10B of overhead so record size on disk will be slightly larger " + "than the configured block size" ) @Internal - public static final Setting label_block_size = setting("unsupported.dbms.block_size.labels", INTEGER, + public static final Setting label_block_size = setting( "unsupported.dbms.block_size.labels", INTEGER, "0", min( 0 ) ); - @Description("An identifier that uniquely identifies this graph database instance within this JVM. " + - "Defaults to an auto-generated number depending on how many instance are started in this JVM.") + @Description( "An identifier that uniquely identifies this graph database instance within this JVM. " + + "Defaults to an auto-generated number depending on how many instance are started in this JVM." ) @Internal - public static final Setting forced_kernel_id = setting("unsupported.dbms.kernel_id", STRING, NO_DEFAULT, - illegalValueMessage("has to be a valid kernel identifier", matches("[a-zA-Z0-9]*"))); + public static final Setting forced_kernel_id = setting( "unsupported.dbms.kernel_id", STRING, NO_DEFAULT, + illegalValueMessage( "has to be a valid kernel identifier", matches( "[a-zA-Z0-9]*" ))); @SuppressWarnings( "unused" ) - @Description("Amount of time in ms the GC monitor thread will wait before taking another measurement.") + @Description( "Amount of time in ms the GC monitor thread will wait before taking another measurement." ) @Internal public static final Setting gc_monitor_interval = MonitorGc.Configuration.gc_monitor_wait_time; @SuppressWarnings( "unused" ) - @Description("The amount of time in ms the monitor thread has to be blocked before logging a message it was " + - "blocked.") + @Description( "The amount of time in ms the monitor thread has to be blocked before logging a message it was " + + "blocked." ) @Internal public static final Setting gc_monitor_block_threshold = MonitorGc.Configuration.gc_monitor_threshold; @@ -473,13 +486,13 @@ public class GraphDatabaseSettings implements LoadableConfig "Log entries are written to the file _query.log_ located in the Logs directory. " + "For location of the Logs directory, see <>. " + "This feature is available in the Neo4j Enterprise Edition." ) - public static final Setting log_queries = setting("dbms.logs.query.enabled", BOOLEAN, FALSE ); + public static final Setting log_queries = setting( "dbms.logs.query.enabled", BOOLEAN, FALSE ); - @Description("Path of the logs directory") + @Description( "Path of the logs directory" ) public static final Setting logs_directory = pathSetting( "dbms.directories.logs", "logs" ); @Internal - public static final Setting log_queries_filename = derivedSetting("dbms.logs.query.path", + public static final Setting log_queries_filename = derivedSetting( "dbms.logs.query.path", logs_directory, ( logs ) -> new File( logs, "query.log" ), PATH ); @@ -496,13 +509,13 @@ public class GraphDatabaseSettings implements LoadableConfig @Description( "Log page hits and page faults for the executed queries being logged." ) public static final Setting log_queries_page_detail_logging_enabled = setting( "dbms.logs.query.page_logging_enabled", BOOLEAN, FALSE ); - @Description("If the execution of query takes more time than this threshold, the query is logged - " + - "provided query logging is enabled. Defaults to 0 seconds, that is all queries are logged.") - public static final Setting log_queries_threshold = setting("dbms.logs.query.threshold", DURATION, "0s"); + @Description( "If the execution of query takes more time than this threshold, the query is logged - " + + "provided query logging is enabled. Defaults to 0 seconds, that is all queries are logged." ) + public static final Setting log_queries_threshold = setting( "dbms.logs.query.threshold", DURATION, "0s" ); @Description( "The file size in bytes at which the query log will auto-rotate. If set to zero then no rotation " + "will occur. Accepts a binary suffix `k`, `m` or `g`." ) - public static final Setting log_queries_rotation_threshold = setting("dbms.logs.query.rotation.size", + public static final Setting log_queries_rotation_threshold = setting( "dbms.logs.query.rotation.size", BYTES, "20m", min( 0L ), max( Long.MAX_VALUE ) ); @Description( "Maximum number of history files for the query log." ) @@ -510,7 +523,7 @@ public class GraphDatabaseSettings implements LoadableConfig INTEGER, "7", min( 1 ) ); @Description( "Specifies number of operations that batch inserter will try to group into one batch before " + - "flushing data into underlying storage.") + "flushing data into underlying storage." ) @Internal public static final Setting batch_inserter_batch_size = setting( "unsupported.tools.batch_inserter.batch_size", INTEGER, "10000" ); @@ -540,7 +553,7 @@ public enum LabelIndex // Security settings - @Description("Enable auth requirement to access Neo4j.") + @Description( "Enable auth requirement to access Neo4j." ) public static final Setting auth_enabled = setting( "dbms.security.auth_enabled", BOOLEAN, "false" ); @Internal @@ -565,16 +578,16 @@ public enum LabelIndex setting( "dbms.security.procedures.whitelist", Settings.STRING, "*" ); // Bolt Settings - @Description("Default network interface to listen for incoming connections. " + + @Description( "Default network interface to listen for incoming connections. " + "To listen for connections on all interfaces, use \"0.0.0.0\". " + "To bind specific connectors to a specific network interfaces, " + - "specify the +listen_address+ properties for the specific connector.") + "specify the +listen_address+ properties for the specific connector." ) public static final Setting default_listen_address = setting( "dbms.connectors.default_listen_address", STRING, "127.0.0.1" ); - @Description("Default hostname or IP address the server uses to advertise itself to its connectors. " + + @Description( "Default hostname or IP address the server uses to advertise itself to its connectors. " + "To advertise a specific hostname or IP address for a specific connector, " + - "specify the +advertised_address+ property for the specific connector.") + "specify the +advertised_address+ property for the specific connector." ) public static final Setting default_advertised_address = setting( "dbms.connectors.default_advertised_address", STRING, "localhost" ); @@ -608,7 +621,7 @@ public static BoltConnector boltConnector( String key ) /** * DEPRECATED: Use {@link org.neo4j.kernel.configuration.Connector} instead. This will be removed in 4.0. */ - @Group("dbms.connector") + @Group( "dbms.connector" ) public static class Connector { @Description( "Enable this connector" ) @@ -626,7 +639,7 @@ public static class Connector // Note: We no longer use the typeDefault parameter because it made for confusing behaviour; // connectors with unspecified would override settings of other, unrelated connectors. // However, we cannot remove the parameter at this - public Connector( String key, @SuppressWarnings("UnusedParameters") String typeDefault ) + public Connector( String key, @SuppressWarnings( "UnusedParameters" ) String typeDefault ) { group = new GroupSettingSupport( Connector.class, key ); enabled = group.scope( setting( "enabled", BOOLEAN, "false" ) ); @@ -669,12 +682,12 @@ public static class BoltConnector extends Connector // Used by config doc generator public BoltConnector() { - this("(bolt-connector-key)"); + this( "(bolt-connector-key)" ); } - public BoltConnector(String key) + public BoltConnector( String key ) { - super(key, null ); + super( key, null ); encryption_level = group.scope( setting( "tls_level", options( EncryptionLevel.class ), EncryptionLevel.OPTIONAL.name() )); Setting legacyAddressSetting = listenAddress( "address", 7687 ); diff --git a/community/kernel/src/main/java/org/neo4j/helpers/Args.java b/community/kernel/src/main/java/org/neo4j/helpers/Args.java index c5d1d7c6217fc..90b10756eec5a 100644 --- a/community/kernel/src/main/java/org/neo4j/helpers/Args.java +++ b/community/kernel/src/main/java/org/neo4j/helpers/Args.java @@ -245,7 +245,7 @@ public Number getNumber( String key, Number defaultValue ) return value != null ? Double.parseDouble( value ) : defaultValue; } - public long getDuration( String key, long defaultValueInMillis) + public long getDuration( String key, long defaultValueInMillis ) { String value = getSingleOptionOrNull( key ); return value != null ? TimeUtil.parseTimeMillis.apply(value) : defaultValueInMillis; diff --git a/community/kernel/src/main/java/org/neo4j/helpers/ProcessFailureException.java b/community/kernel/src/main/java/org/neo4j/helpers/ProcessFailureException.java index ab45697ffc93a..ab53403bd304f 100644 --- a/community/kernel/src/main/java/org/neo4j/helpers/ProcessFailureException.java +++ b/community/kernel/src/main/java/org/neo4j/helpers/ProcessFailureException.java @@ -69,7 +69,7 @@ private static String message( List causes ) return result.toString(); } - @SuppressWarnings("ThrowableResultOfMethodCallIgnored") + @SuppressWarnings( "ThrowableResultOfMethodCallIgnored" ) private static Throwable cause( List causes ) { return causes.size() >= 1 ? causes.get( 0 ).failure : null; diff --git a/community/kernel/src/main/java/org/neo4j/helpers/RunCarefully.java b/community/kernel/src/main/java/org/neo4j/helpers/RunCarefully.java index 6c4f7bb5956bf..4a50488efac94 100644 --- a/community/kernel/src/main/java/org/neo4j/helpers/RunCarefully.java +++ b/community/kernel/src/main/java/org/neo4j/helpers/RunCarefully.java @@ -46,7 +46,7 @@ public void run() { o.run(); } - catch ( RuntimeException e) + catch ( RuntimeException e ) { error = combine( error, e ); } diff --git a/community/kernel/src/main/java/org/neo4j/helpers/Strings.java b/community/kernel/src/main/java/org/neo4j/helpers/Strings.java index e496c30b813e3..79ee77ce0840a 100644 --- a/community/kernel/src/main/java/org/neo4j/helpers/Strings.java +++ b/community/kernel/src/main/java/org/neo4j/helpers/Strings.java @@ -122,7 +122,7 @@ public static void escape( Appendable output, String arg ) throws IOException for ( int i = 0; i < len; i++ ) { char ch = arg.charAt( i ); - switch (ch) + switch ( ch ) { case '"': output.append( "\\\"" ); diff --git a/community/kernel/src/main/java/org/neo4j/helpers/Uris.java b/community/kernel/src/main/java/org/neo4j/helpers/Uris.java index 76411df3d3e47..911b0b6d6b14b 100644 --- a/community/kernel/src/main/java/org/neo4j/helpers/Uris.java +++ b/community/kernel/src/main/java/org/neo4j/helpers/Uris.java @@ -44,7 +44,7 @@ public static Function parameter( final String name ) } String query = uri.getQuery(); - if (query != null) + if ( query != null ) { for ( String param : query.split( "&" ) ) { diff --git a/community/kernel/src/main/java/org/neo4j/helpers/progress/Aggregator.java b/community/kernel/src/main/java/org/neo4j/helpers/progress/Aggregator.java index dcf7f1978967f..674984d4022eb 100644 --- a/community/kernel/src/main/java/org/neo4j/helpers/progress/Aggregator.java +++ b/community/kernel/src/main/java/org/neo4j/helpers/progress/Aggregator.java @@ -31,9 +31,9 @@ final class Aggregator private final Map states = new ConcurrentHashMap<>(); private final Indicator indicator; - @SuppressWarnings("unused"/*accessed through updater*/) + @SuppressWarnings( "unused"/*accessed through updater*/ ) private volatile long progress; - @SuppressWarnings("unused"/*accessed through updater*/) + @SuppressWarnings( "unused"/*accessed through updater*/ ) private volatile int last; private static final AtomicLongFieldUpdater PROGRESS = newUpdater( Aggregator.class, "progress" ); private static final AtomicIntegerFieldUpdater LAST = diff --git a/community/kernel/src/main/java/org/neo4j/helpers/progress/Completion.java b/community/kernel/src/main/java/org/neo4j/helpers/progress/Completion.java index 134690c980dfa..a6cf2bd361b0a 100644 --- a/community/kernel/src/main/java/org/neo4j/helpers/progress/Completion.java +++ b/community/kernel/src/main/java/org/neo4j/helpers/progress/Completion.java @@ -33,7 +33,7 @@ public final class Completion private volatile Collection callbacks = new ArrayList<>(); private final List processFailureCauses = new ArrayList<>(); - @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter") + @SuppressWarnings( "SynchronizationOnLocalVariableOrMethodParameter" ) void complete() { Collection callbacks = this.callbacks; @@ -65,7 +65,7 @@ void signalFailure( String part, Throwable e ) complete(); } - @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter") + @SuppressWarnings( "SynchronizationOnLocalVariableOrMethodParameter" ) void notify( Runnable callback ) { if ( callback == null ) @@ -90,7 +90,7 @@ void notify( Runnable callback ) } } - @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter") + @SuppressWarnings( "SynchronizationOnLocalVariableOrMethodParameter" ) public void await( long timeout, TimeUnit unit ) throws InterruptedException, TimeoutException, ProcessFailureException { diff --git a/community/kernel/src/main/java/org/neo4j/helpers/progress/ProgressMonitorFactory.java b/community/kernel/src/main/java/org/neo4j/helpers/progress/ProgressMonitorFactory.java index a76e06ac8197a..bb2bc63438ba5 100644 --- a/community/kernel/src/main/java/org/neo4j/helpers/progress/ProgressMonitorFactory.java +++ b/community/kernel/src/main/java/org/neo4j/helpers/progress/ProgressMonitorFactory.java @@ -99,7 +99,7 @@ public static class MultiPartBuilder private MultiPartBuilder( ProgressMonitorFactory factory, String process ) { - this.aggregator = new Aggregator(factory.newIndicator( process )); + this.aggregator = new Aggregator( factory.newIndicator( process ) ); } public ProgressListener progressForPart( String part, long totalCount ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseQueryService.java b/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseQueryService.java index 5d48ab1eb82bc..8684df98e2f2a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseQueryService.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseQueryService.java @@ -67,7 +67,7 @@ public interface GraphDatabaseQueryService * @return internal transaction */ InternalTransaction beginTransaction( KernelTransaction.Type type, SecurityContext securityContext, long timeout, - TimeUnit unit); + TimeUnit unit ); URL validateURLAccess( URL url ) throws URLAccessValidationError; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java index 723211e182024..278b6fe69b161 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java @@ -172,7 +172,7 @@ long nodesCountIndexed( IndexDescriptor index, long nodeId, Object value ) int nodeGetDegree( long nodeId, Direction direction ) throws EntityNotFoundException; - boolean nodeIsDense(long nodeId) throws EntityNotFoundException; + boolean nodeIsDense( long nodeId ) throws EntityNotFoundException; /** * Returns all labels set on node with id {@code nodeId}. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/InvalidTransactionTypeKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/InvalidTransactionTypeKernelException.java index b94dff42875fb..bf1e3d5bb943f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/InvalidTransactionTypeKernelException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/InvalidTransactionTypeKernelException.java @@ -21,7 +21,7 @@ public class InvalidTransactionTypeKernelException extends KernelException { - public InvalidTransactionTypeKernelException(String message) + public InvalidTransactionTypeKernelException( String message ) { super( Status.Transaction.ForbiddenDueToTransactionType, (Throwable) null, message ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/LabelNotFoundKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/LabelNotFoundKernelException.java index 58575d33bd92b..2ab50b279bf16 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/LabelNotFoundKernelException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/LabelNotFoundKernelException.java @@ -23,6 +23,6 @@ public class LabelNotFoundKernelException extends KernelException { public LabelNotFoundKernelException( String message, Exception cause ) { - super( Status.Schema.LabelAccessFailed, cause, message); + super( Status.Schema.LabelAccessFailed, cause, message ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeNotFoundException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeNotFoundException.java index 75435c6a38978..f401d3a3cb9e7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeNotFoundException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeNotFoundException.java @@ -23,6 +23,6 @@ public class RelationshipTypeNotFoundException extends KernelException { public RelationshipTypeNotFoundException( String message, Exception cause ) { - super( Status.Schema.RelationshipTypeAccessFailed, cause, message); + super( Status.Schema.RelationshipTypeAccessFailed, cause, message ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java index f458be5338fc4..acadd5b7c6b2c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java @@ -53,7 +53,7 @@ public ConstraintDescriptor constraint() public String getUserMessage( TokenNameLookup tokenNameLookup ) { String message = "Unable to create " + constraint.prettyPrint( tokenNameLookup ); - if (cause != null) + if ( cause != null ) { message = String.format( "%s:%n%s", message, cause ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java index 9ec5966968ce2..bd76cd20f1772 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java @@ -63,7 +63,7 @@ static String messageWithLabelAndPropertyName( TokenNameLookup tokenNameLookup, String propertyString = propertyIds.length == 1 ? "property '" + tokenNameLookup.propertyKeyGetName( propertyIds[0]) + "'" : "properties " + Arrays.stream( propertyIds ) - .mapToObj( (i) -> "'" + tokenNameLookup.propertyKeyGetName( i ) + "'") + .mapToObj( ( i ) -> "'" + tokenNameLookup.propertyKeyGetName( i ) + "'" ) .collect( Collectors.joining( " and " )); return String.format( formatString, tokenNameLookup.labelGetName( descriptor.getLabelId() ), propertyString); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexProvider.java index 83a65870f5737..27dbf42499586 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexProvider.java @@ -239,15 +239,15 @@ public static class Descriptor public Descriptor( String key, String version ) { - if (key == null) + if ( key == null ) { throw new IllegalArgumentException( "null provider key prohibited" ); } - if (key.length() == 0) + if ( key.length() == 0 ) { throw new IllegalArgumentException( "empty provider key prohibited" ); } - if (version == null) + if ( version == null ) { throw new IllegalArgumentException( "null provider version prohibited" ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/labelscan/LoggingMonitor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/labelscan/LoggingMonitor.java index e366de8a11d78..d6727ce6e9a6e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/labelscan/LoggingMonitor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/labelscan/LoggingMonitor.java @@ -72,7 +72,7 @@ public void rebuilt( long roughNodeCount ) public void recoveryCompleted( Map data ) { StringBuilder builder = new StringBuilder( "Scan store recovery completed:" ); - data.forEach( (key,value) -> builder.append( format( " %s: %s", key, value ) ) ); + data.forEach( ( key, value ) -> builder.append( format( " %s: %s", key, value ) ) ); log.info( builder.toString() ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/proc/CallableUserAggregationFunction.java b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/CallableUserAggregationFunction.java index 294f9f4f28277..2ebdd3f5469cc 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/proc/CallableUserAggregationFunction.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/CallableUserAggregationFunction.java @@ -49,6 +49,6 @@ public UserFunctionSignature signature() } @Override - public abstract Aggregator create( Context ctx) throws ProcedureException; + public abstract Aggregator create( Context ctx ) throws ProcedureException; } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Neo4jTypes.java b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Neo4jTypes.java index 24b64dea6f19b..885dd241a13b6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Neo4jTypes.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Neo4jTypes.java @@ -100,7 +100,7 @@ public static class FloatType extends NumberType { public FloatType() { - super( "FLOAT?"); + super( "FLOAT?" ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/proc/ProcedureSignature.java b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/ProcedureSignature.java index ccf98c80b57d3..ac194ef30ebe1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/proc/ProcedureSignature.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/ProcedureSignature.java @@ -55,7 +55,7 @@ public ProcedureSignature( QualifiedName name, Optional deprecated, String[] allowed, Optional description, - Optional warning) + Optional warning ) { this.name = name; this.inputSignature = unmodifiableList( inputSignature ); @@ -172,13 +172,13 @@ public Builder mode( Mode mode ) return this; } - public Builder description(String description) + public Builder description( String description ) { this.description = Optional.of( description ); return this; } - public Builder deprecatedBy(String deprecated) + public Builder deprecatedBy( String deprecated ) { this.deprecated = Optional.of( deprecated ); return this; @@ -218,13 +218,15 @@ public Builder warning( String warning ) public ProcedureSignature build() { - return new ProcedureSignature(name, inputSignature, outputSignature, mode, deprecated, allowed, description, warning ); + return new ProcedureSignature( name, inputSignature, outputSignature, mode, deprecated, allowed, + description, warning ); } } - public static Builder procedureSignature(String ... namespaceAndName) + public static Builder procedureSignature( String... namespaceAndName ) { - String[] namespace = namespaceAndName.length > 1 ? Arrays.copyOf( namespaceAndName, namespaceAndName.length - 1 ) : new String[0]; + String[] namespace = namespaceAndName.length > 1 ? + Arrays.copyOf( namespaceAndName, namespaceAndName.length - 1 ) : new String[0]; String name = namespaceAndName[namespaceAndName.length - 1]; return procedureSignature( namespace, name ); } @@ -234,12 +236,12 @@ public static Builder procedureSignature( QualifiedName name ) return new Builder( name.namespace(), name.name() ); } - public static Builder procedureSignature(String[] namespace, String name) + public static Builder procedureSignature( String[] namespace, String name ) { - return new Builder(namespace, name); + return new Builder( namespace, name ); } - public static QualifiedName procedureName( String ... namespaceAndName) + public static QualifiedName procedureName( String... namespaceAndName ) { return procedureSignature( namespaceAndName ).build().name(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/proc/UserFunctionSignature.java b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/UserFunctionSignature.java index aa99ec1932054..c629c17e95052 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/proc/UserFunctionSignature.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/UserFunctionSignature.java @@ -131,13 +131,13 @@ public Builder( String[] namespace, String name ) this.name = new QualifiedName( namespace, name ); } - public Builder description(String description) + public Builder description( String description ) { this.description = Optional.of( description ); return this; } - public Builder deprecatedBy(String deprecated) + public Builder deprecatedBy( String deprecated ) { this.deprecated = Optional.of( deprecated ); return this; @@ -165,17 +165,19 @@ public Builder allowed( String[] allowed ) public UserFunctionSignature build() { - if (outputType == null) + if ( outputType == null ) { throw new IllegalStateException( "output type must be set" ); } - return new UserFunctionSignature(name, inputSignature, outputType, deprecated, allowed, description ); + return new UserFunctionSignature( name, inputSignature, outputType, deprecated, allowed, description ); } } - public static Builder functionSignature(String ... namespaceAndName) + public static Builder functionSignature( String... namespaceAndName ) { - String[] namespace = namespaceAndName.length > 1 ? Arrays.copyOf( namespaceAndName, namespaceAndName.length - 1 ) : new String[0]; + String[] namespace = namespaceAndName.length > 1 ? + Arrays.copyOf( namespaceAndName, namespaceAndName.length - 1 ) : + new String[0]; String name = namespaceAndName[namespaceAndName.length - 1]; return functionSignature( namespace, name ); } @@ -185,12 +187,12 @@ public static Builder functionSignature( QualifiedName name ) return new Builder( name.namespace(), name.name() ); } - public static Builder functionSignature(String[] namespace, String name) + public static Builder functionSignature( String[] namespace, String name ) { - return new Builder(namespace, name); + return new Builder( namespace, name ); } - public static QualifiedName procedureName( String ... namespaceAndName) + public static QualifiedName procedureName( String... namespaceAndName ) { return functionSignature( namespaceAndName ).build().name(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/BooleanProperty.java b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/BooleanProperty.java index 056054b312c94..9c38c472a1b70 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/BooleanProperty.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/BooleanProperty.java @@ -34,7 +34,7 @@ final class BooleanProperty extends DefinedProperty } @Override - @SuppressWarnings("UnnecessaryUnboxing") + @SuppressWarnings( "UnnecessaryUnboxing" ) public boolean valueEquals( Object other ) { return other instanceof Boolean && value == ((Boolean) other).booleanValue(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/ByteProperty.java b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/ByteProperty.java index faee89958cd48..7c8ed7a20cffa 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/ByteProperty.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/ByteProperty.java @@ -29,7 +29,7 @@ final class ByteProperty extends IntegralNumberProperty ByteProperty( int propertyKeyId, byte value ) { - super(propertyKeyId); + super( propertyKeyId ); this.value = value; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/CharProperty.java b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/CharProperty.java index eead428030840..d44f245b37d87 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/CharProperty.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/CharProperty.java @@ -34,7 +34,7 @@ final class CharProperty extends DefinedProperty implements DefinedProperty.With } @Override - @SuppressWarnings("UnnecessaryUnboxing") + @SuppressWarnings( "UnnecessaryUnboxing" ) public boolean valueEquals( Object other ) { if ( other instanceof Character ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/IntProperty.java b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/IntProperty.java index 21a807849f8b5..063b70abb899f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/IntProperty.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/IntProperty.java @@ -29,7 +29,7 @@ final class IntProperty extends IntegralNumberProperty IntProperty( int propertyKeyId, int value ) { - super(propertyKeyId); + super( propertyKeyId ); this.value = value; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/LazyProperty.java b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/LazyProperty.java index 890331a11a06e..316fd609e169f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/LazyProperty.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/LazyProperty.java @@ -77,7 +77,7 @@ protected Object produceValue() * @param value the value to cast and prepare. * @return the cast and prepared value. */ - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) protected T castAndPrepareForReturn( Object value ) { return (T) value; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/NumberProperty.java b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/NumberProperty.java index 7e4a5d20687d0..6e8f0775c6641 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/NumberProperty.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/NumberProperty.java @@ -23,6 +23,6 @@ public abstract class NumberProperty extends DefinedProperty implements DefinedP { public NumberProperty( int propertyKeyId ) { - super(propertyKeyId); + super( propertyKeyId ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/Property.java b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/Property.java index 4b736f0c6fbd9..1ade057a75ba3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/properties/Property.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/properties/Property.java @@ -105,27 +105,27 @@ public static DefinedProperty lazyArrayProperty( int propertyKeyId, Callable listProcedures() } @Description( "List all user functions in the DBMS." ) - @Procedure(name = "dbms.functions", mode = DBMS) + @Procedure( name = "dbms.functions", mode = DBMS ) public Stream listFunctions() { return graph.getDependencyResolver().resolveDependency( Procedures.class ).getAllFunctions().stream() diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java index 87d37df87512f..0fe298b039e97 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java @@ -164,10 +164,10 @@ public void resampleOutdatedIndexes() } @Description( "Show the schema of the data." ) - @Procedure(name = "db.schema", mode = READ) + @Procedure( name = "db.schema", mode = READ ) public Stream metaGraph() throws ProcedureException { - return Stream.of(new SchemaProcedure(graphDatabaseAPI, tx).buildSchemaGraph()); + return Stream.of( new SchemaProcedure( graphDatabaseAPI, tx ).buildSchemaGraph() ); } @Description( "List all constraints in the database." ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/JmxQueryProcedure.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/JmxQueryProcedure.java index 4172b3dfb4a22..b3ad7081e2565 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/JmxQueryProcedure.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/JmxQueryProcedure.java @@ -198,10 +198,8 @@ private Map toNeo4jValue( Map attributeValue ) // Build a new map with the same keys, but each value passed // through `toNeo4jValue` return attributeValue.entrySet().stream() - .map( (e) -> pair( - e.getKey().toString(), - toNeo4jValue( e.getValue() )) ) - .collect( Collectors.toMap( Pair::first, Pair::other ) ); + .map( ( e ) -> pair( e.getKey().toString(), toNeo4jValue( e.getValue() ) ) ) + .collect( Collectors.toMap( Pair::first, Pair::other ) ); } private List toNeo4jValue( Object[] array ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/configuration/Connector.java b/community/kernel/src/main/java/org/neo4j/kernel/configuration/Connector.java index ac33ee18d7da3..b94bf2ff972c3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/configuration/Connector.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/configuration/Connector.java @@ -27,7 +27,7 @@ import static org.neo4j.kernel.configuration.Settings.options; import static org.neo4j.kernel.configuration.Settings.setting; -@Group("dbms.connector") +@Group( "dbms.connector" ) public class Connector { @Description( "Enable this connector" ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/configuration/GraphDatabaseConfigurationMigrator.java b/community/kernel/src/main/java/org/neo4j/kernel/configuration/GraphDatabaseConfigurationMigrator.java index e1b3521ab262b..785af4535ceaa 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/configuration/GraphDatabaseConfigurationMigrator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/configuration/GraphDatabaseConfigurationMigrator.java @@ -54,8 +54,8 @@ public void setValueWithOldSetting( String value, Map rawConfigur } } ); - add( new SpecificPropertyMigration("dbms.transaction_timeout", - "dbms.transaction_timeout has been replaced with dbms.rest.transaction.idle_timeout.") + add( new SpecificPropertyMigration( "dbms.transaction_timeout", + "dbms.transaction_timeout has been replaced with dbms.rest.transaction.idle_timeout." ) { @Override public void setValueWithOldSetting( String value, Map rawConfiguration ) @@ -75,8 +75,8 @@ public void setValueWithOldSetting( String value, Map rawConfigur } } ); - add( new SpecificPropertyMigration("unsupported.dbms.executiontime_limit.time", - "unsupported.dbms.executiontime_limit.time has been replaced with dbms.transaction.timeout.") + add( new SpecificPropertyMigration( "unsupported.dbms.executiontime_limit.time", + "unsupported.dbms.executiontime_limit.time has been replaced with dbms.transaction.timeout." ) { @Override public void setValueWithOldSetting( String value, Map rawConfiguration ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/configuration/GroupSettingSupport.java b/community/kernel/src/main/java/org/neo4j/kernel/configuration/GroupSettingSupport.java index 79fdbc147d2e5..cc22b371769d5 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/configuration/GroupSettingSupport.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/configuration/GroupSettingSupport.java @@ -85,7 +85,7 @@ private GroupSettingSupport( String groupPrefix, String groupKey ) */ public Setting scope( Setting setting ) { - setting.withScope( (key) -> String.format( "%s.%s", groupName, key ) ); + setting.withScope( ( key ) -> String.format( "%s.%s", groupName, key ) ); return setting; } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/configuration/HttpConnector.java b/community/kernel/src/main/java/org/neo4j/kernel/configuration/HttpConnector.java index d982858ce2845..40a7746aa518d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/configuration/HttpConnector.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/configuration/HttpConnector.java @@ -32,9 +32,9 @@ import static org.neo4j.kernel.configuration.Settings.options; import static org.neo4j.kernel.configuration.Settings.setting; -@Description("Configuration options for HTTP connectors. " + +@Description( "Configuration options for HTTP connectors. " + "\"(http-connector-key)\" is a placeholder for a unique name for the connector, for instance " + - "\"http-public\" or some other name that describes what the connector is for.") + "\"http-public\" or some other name that describes what the connector is for." ) public class HttpConnector extends Connector { @Description( "Enable TLS for this connector" ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/configuration/Settings.java b/community/kernel/src/main/java/org/neo4j/kernel/configuration/Settings.java index 83b8a91bb115b..e857239b1246a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/configuration/Settings.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/configuration/Settings.java @@ -81,7 +81,7 @@ private interface SettingHelper } // Set default value to this if user HAS to set a value - @SuppressWarnings("RedundantStringConstructorCall") + @SuppressWarnings( "RedundantStringConstructorCall" ) // It's an explicitly allocated string so identity equality checks work public static final String MANDATORY = new String( "mandatory" ); public static final String NO_DEFAULT = null; @@ -109,7 +109,7 @@ private interface SettingHelper public static final String ANY = ".+"; - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static BaseSetting setting( final String name, final Function parser, final String defaultValue ) { @@ -123,7 +123,7 @@ public static BaseSetting setting( final String name, final Function Setting setting( final String name, final Function parser, final Setting inheritedSetting ) { @@ -155,7 +155,7 @@ public static BaseSetting setting( final String name, final Function null; + defaultLookup = ( n, from ) -> null; } if ( inheritedSetting != null ) @@ -170,7 +170,7 @@ public static BaseSetting setting( final String name, final Function Setting derivedSetting( String name, Setting in1, Setting in2, BiFunction derivation, - Function overrideConverter) + Function overrideConverter ) { // NOTE: // we do not scope the input settings here (indeed they might be shared...) @@ -221,7 +221,7 @@ public String valueDescription() public static Setting derivedSetting( String name, Setting in1, Function derivation, - Function overrideConverter) + Function overrideConverter ) { return new ScopeAwareSetting() { @@ -292,7 +292,7 @@ public File apply( Function config ) { value = defaultValue; } - if (value == null) + if ( value == null ) { return null; } @@ -1086,7 +1086,7 @@ private static int findFirstNonDigit( String numberWithPotentialUnit ) // Setting helpers private static BiFunction, String> named() { - return (name, settings) -> settings.apply( name ); + return ( name, settings ) -> settings.apply( name ); } private static BiFunction,String> withDefault( final String defaultValue, @@ -1300,7 +1300,7 @@ public String valueDescription() StringBuilder builder = new StringBuilder( ); builder.append( name() ).append( " is " ).append( parser.toString() ); - if (valueConverters.length > 0) + if ( valueConverters.length > 0 ) { builder.append( " which " ); for ( int i = 0; i < valueConverters.length; i++ ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java index 352b45a0d127a..6031765e17ce9 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java @@ -582,7 +582,7 @@ public NodeKeyConstraintDescriptor nodeKeyConstraintCreate( KernelStatement stat Iterator> nodes = new NodeLoadingIterator( nodesGetForLabel( state, descriptor.getLabelId() ), ( id ) -> nodeCursorById( state, id ) ); constraintSemantics.validateNodeKeyConstraint( nodes, descriptor, - (node, propertyKey) -> entityReadOperations.nodeHasProperty(state, node, propertyKey) ); + ( node, propertyKey ) -> entityReadOperations.nodeHasProperty( state, node, propertyKey ) ); return schemaWriteOperations.nodeKeyConstraintCreate( state, descriptor ); } @@ -603,7 +603,7 @@ public NodeExistenceConstraintDescriptor nodePropertyExistenceConstraintCreate( Iterator> nodes = new NodeLoadingIterator( nodesGetForLabel( state, descriptor.getLabelId() ), ( id ) -> nodeCursorById( state, id ) ); constraintSemantics.validateNodePropertyExistenceConstraint( nodes, descriptor, - (node, propertyKey) -> entityReadOperations.nodeHasProperty(state, node, propertyKey) ); + ( node, propertyKey ) -> entityReadOperations.nodeHasProperty( state, node, propertyKey ) ); return schemaWriteOperations.nodePropertyExistenceConstraintCreate( state, descriptor ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java index f2c1c8f26e44a..a8f33089b373d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java @@ -184,7 +184,7 @@ public UniquenessConstraintDescriptor uniquePropertyConstraintCreate( @Override public NodeExistenceConstraintDescriptor nodePropertyExistenceConstraintCreate( KernelStatement state, - LabelSchemaDescriptor descriptor) throws AlreadyConstrainedException, CreateConstraintFailureException, + LabelSchemaDescriptor descriptor ) throws AlreadyConstrainedException, CreateConstraintFailureException, RepeatedPropertyInCompositeSchemaException { assertValidDescriptor( descriptor, OperationContext.CONSTRAINT_CREATION ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelSchemaStateStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelSchemaStateStore.java index f660e0307cbd0..12c9c81cecd97 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelSchemaStateStore.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelSchemaStateStore.java @@ -46,8 +46,8 @@ public KernelSchemaStateStore( LogProvider logProvider ) this.log = logProvider.getLog( getClass() ); } - @SuppressWarnings("unchecked") - public V get(K key) + @SuppressWarnings( "unchecked" ) + public V get( K key ) { lock.readLock().lock(); try @@ -60,18 +60,18 @@ public V get(K key) } } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) @Override - public V getOrCreate(K key, Function creator) + public V getOrCreate( K key, Function creator ) { V currentValue = get(key); - if (currentValue == null) + if ( currentValue == null ) { lock.writeLock().lock(); try { V lockedValue = (V) state.get( key ); - if (lockedValue == null) + if ( lockedValue == null ) { V newValue = creator.apply( key ); state.put( key, newValue ); @@ -93,7 +93,7 @@ public V getOrCreate(K key, Function creator) } } - public void replace(Map replacement) + public void replace( Map replacement ) { lock.writeLock().lock(); try @@ -106,7 +106,7 @@ public void replace(Map replacement) } } - public void apply(Map updates) + public void apply( Map updates ) { lock.writeLock().lock(); try diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java index d64b8ec035ea8..2410309965bcc 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java @@ -760,7 +760,7 @@ public int labelGetOrCreateForName( String labelName ) throws IllegalTokenNameEx { statement.assertOpen(); int id = tokenRead().labelGetForName( statement, labelName ); - if (id != KeyReadOperations.NO_SUCH_LABEL ) + if ( id != KeyReadOperations.NO_SUCH_LABEL ) { return id; } @@ -773,7 +773,7 @@ public int propertyKeyGetOrCreateForName( String propertyKeyName ) throws Illega { statement.assertOpen(); int id = tokenRead().propertyKeyGetForName( statement, propertyKeyName ); - if (id != KeyReadOperations.NO_SUCH_PROPERTY_KEY ) + if ( id != KeyReadOperations.NO_SUCH_PROPERTY_KEY ) { return id; } @@ -786,7 +786,7 @@ public int relationshipTypeGetOrCreateForName( String relationshipTypeName ) thr { statement.assertOpen(); int id = tokenRead().relationshipTypeGetForName( statement, relationshipTypeName ); - if (id != KeyReadOperations.NO_SUCH_RELATIONSHIP_TYPE ) + if ( id != KeyReadOperations.NO_SUCH_RELATIONSHIP_TYPE ) { return id; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/PropertyValueComparison.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/PropertyValueComparison.java index 8b7c3d6b86b26..43d1779855ace 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/PropertyValueComparison.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/PropertyValueComparison.java @@ -187,7 +187,7 @@ public int compare( SuperType left, SuperType right ) private static class NumberPropertyValueComparator extends PropertyValueComparator { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) @Override public int compare( Number left, Number right ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StackingQueryRegistrationOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StackingQueryRegistrationOperations.java index 2f6aa226c6ae3..e57b77b62bf6a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StackingQueryRegistrationOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StackingQueryRegistrationOperations.java @@ -41,7 +41,7 @@ public StackingQueryRegistrationOperations( SystemNanoClock clock ) } @Override - public Stream executingQueries( KernelStatement statement) + public Stream executingQueries( KernelStatement statement ) { return statement.executingQueryList().queries(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StatementOperationParts.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StatementOperationParts.java index 15483a89e0dbe..6bef97c2becf6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StatementOperationParts.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StatementOperationParts.java @@ -19,7 +19,6 @@ */ package org.neo4j.kernel.impl.api; -import org.neo4j.kernel.impl.api.operations.QueryRegistrationOperations; import org.neo4j.kernel.impl.api.operations.CountsOperations; import org.neo4j.kernel.impl.api.operations.EntityReadOperations; import org.neo4j.kernel.impl.api.operations.EntityWriteOperations; @@ -28,6 +27,7 @@ import org.neo4j.kernel.impl.api.operations.LegacyIndexReadOperations; import org.neo4j.kernel.impl.api.operations.LegacyIndexWriteOperations; import org.neo4j.kernel.impl.api.operations.LockOperations; +import org.neo4j.kernel.impl.api.operations.QueryRegistrationOperations; import org.neo4j.kernel.impl.api.operations.SchemaReadOperations; import org.neo4j.kernel.impl.api.operations.SchemaStateOperations; import org.neo4j.kernel.impl.api.operations.SchemaWriteOperations; @@ -173,7 +173,8 @@ private T checkNotNull( T object, Class cls ) return object; } - private T eitherOr( T first, T other, @SuppressWarnings("UnusedParameters"/*used as type flag*/) Class cls ) + private T eitherOr( T first, T other, + @SuppressWarnings( "UnusedParameters"/*used as type flag*/ ) Class cls ) { return first != null ? first : other; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/ContractCheckingIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/ContractCheckingIndexProxy.java index 1f0c0dae9e8b6..03f5e86f80a89 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/ContractCheckingIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/ContractCheckingIndexProxy.java @@ -193,7 +193,7 @@ private void openCall( String name ) } } - private void ensureNoOpenCalls(String name) + private void ensureNoOpenCalls( String name ) { if ( openCalls.get() > 0 ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMapReference.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMapReference.java index a5668fb302771..771fea9489005 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMapReference.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMapReference.java @@ -72,7 +72,7 @@ public long getOnlineIndexId( LabelSchemaDescriptor descriptor ) throws IndexNot return indexMap.getIndexId( descriptor ); default: - throw new IndexNotFoundKernelException( "Expected index on " + descriptor + " to be online."); + throw new IndexNotFoundKernelException( "Expected index on " + descriptor + " to be online." ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingServiceFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingServiceFactory.java index 09428099b3aa5..0bdbada55b125 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingServiceFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingServiceFactory.java @@ -57,8 +57,8 @@ public static IndexingService createIndexingService( Config config, IndexSamplingControllerFactory factory = new IndexSamplingControllerFactory( samplingConfig, storeView, scheduler, tokenNameLookup, logProvider ); IndexSamplingController indexSamplingController = factory.create( indexMapRef ); - IndexProxyCreator proxySetup = new IndexProxyCreator( - samplingConfig, storeView, providerMap, tokenNameLookup, logProvider); + IndexProxyCreator proxySetup = + new IndexProxyCreator( samplingConfig, storeView, providerMap, tokenNameLookup, logProvider ); return new IndexingService( proxySetup, providerMap, indexMapRef, storeView, indexRules, indexSamplingController, tokenNameLookup, scheduler, schemaStateChangeCallback, diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java index 3e79d1f29b075..b1ded4696e17e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java @@ -168,7 +168,7 @@ public StoreScan indexAllNodes() { int[] labelIds = labelIds(); int[] propertyKeyIds = propertyKeyIds(); - IntPredicate propertyKeyIdFilter = (propertyKeyId) -> contains( propertyKeyIds, propertyKeyId ); + IntPredicate propertyKeyIdFilter = ( propertyKeyId ) -> contains( propertyKeyIds, propertyKeyId ); storeScan = storeView.visitNodes( labelIds, propertyKeyIdFilter, new NodePopulationVisitor(), null, false ); storeScan.configure( populations ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdates.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdates.java index 3a49c0fbc1427..76038f6ca3627 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdates.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdates.java @@ -476,7 +476,7 @@ boolean hasAfter() @Override public String toString() { - switch (type) + switch ( type ) { case NoValue: return "NoValue"; case Before: return format( "Before(%s)", before ); @@ -505,7 +505,7 @@ public boolean equals( Object o ) return false; } - switch (type) + switch ( type ) { case NoValue: return true; case Before: return propertyValueEqual( before, that.before ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java index 2dbba90553bb2..6048d35a82de1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java @@ -105,7 +105,7 @@ public void recoverIndexSamples() public interface RecoveryCondition { - boolean test(long indexId, IndexDescriptor descriptor); + boolean test( long indexId, IndexDescriptor descriptor ); } private void scheduleSampling( IndexSamplingMode mode, IndexMap indexMap ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobFactory.java index 66a254dba124d..1768958782527 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobFactory.java @@ -23,5 +23,5 @@ public interface IndexSamplingJobFactory { - IndexSamplingJob create( long indexId, IndexProxy indexProxy); + IndexSamplingJob create( long indexId, IndexProxy indexProxy ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTracker.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTracker.java index a770ab05dd470..f7c5c081ff1f2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTracker.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTracker.java @@ -134,7 +134,7 @@ public void waitUntilCanExecuteMoreSamplingJobs() } } - public void awaitAllJobs(long time, TimeUnit unit) throws InterruptedException + public void awaitAllJobs( long time, TimeUnit unit ) throws InterruptedException { lock.lock(); try diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyWriteOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyWriteOperations.java index e60bc71958295..aa1cdc70ee149 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyWriteOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyWriteOperations.java @@ -53,8 +53,8 @@ void labelCreateForName( KernelStatement state, String labelName, * Returns a property key id for a property key. If the key doesn't exist prior to * this call it gets created. */ - void propertyKeyCreateForName( KernelStatement state, String propertyKeyName, - int id) throws IllegalTokenNameException; + void propertyKeyCreateForName( KernelStatement state, String propertyKeyName, int id ) + throws IllegalTokenNameException; void relationshipTypeCreateForName( KernelStatement state, String relationshipTypeName, int id ) throws IllegalTokenNameException; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/StateDefaults.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/StateDefaults.java index 3ad90c82d682b..3f2b2d13c4de3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/StateDefaults.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/StateDefaults.java @@ -104,7 +104,7 @@ final Iterable values( TxState state ) { return Iterables.empty(); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Collection values = map.values(); return values; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java index fbb49cca8c526..11cd35eb15f23 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java @@ -527,7 +527,7 @@ public DoubleLongRegister indexSample( LabelSchemaDescriptor descriptor, DoubleL return counts.indexSample( tryGetIndexId( descriptor ), target ); } - private long tryGetIndexId( LabelSchemaDescriptor descriptor) throws IndexNotFoundKernelException + private long tryGetIndexId( LabelSchemaDescriptor descriptor ) throws IndexNotFoundKernelException { return indexService.getIndexId( descriptor ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/GraphPropertiesProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/GraphPropertiesProxy.java index acaade0bc3971..4381424956c3e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/GraphPropertiesProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/GraphPropertiesProxy.java @@ -100,7 +100,7 @@ public Object getProperty( String key ) Object value = statement.readOperations().graphGetProperty( propertyKeyId ); - if (value == null) + if ( value == null ) { throw new PropertyNotFoundException( propertyKeyId, EntityType.GRAPH, -1 ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java index 62b4817404a64..cb467d7abcec7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java @@ -100,7 +100,7 @@ public void visit( long id, int type, long startNode, long endNode ) throws Runt private void initializeData() { // it enough to check only start node, since it's absence will indicate that data was not yet loaded - if (startNode == AbstractBaseRecord.NO_ID) + if ( startNode == AbstractBaseRecord.NO_ID ) { try ( Statement statement = actions.statement() ) { @@ -338,7 +338,7 @@ public Object getProperty( String key ) Object value = statement.readOperations().relationshipGetProperty( getId(), propertyId ); - if (value == null) + if ( value == null ) { throw new PropertyNotFoundException( propertyId, EntityType.RELATIONSHIP, getId() ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/PropertyContainerLocker.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/PropertyContainerLocker.java index 0b231684dc302..6322518476ebb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/PropertyContainerLocker.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/PropertyContainerLocker.java @@ -41,7 +41,7 @@ public Lock exclusiveLock( Supplier stmtSupplier, PropertyContainer c if ( container instanceof Node ) { statement.readOperations().acquireExclusive( ResourceTypes.NODE, ((Node) container).getId() ); - return new CoreAPILock(stmtSupplier, ResourceTypes.NODE, ((Node) container).getId()) + return new CoreAPILock( stmtSupplier, ResourceTypes.NODE, ((Node) container).getId() ) { @Override void release( Statement statement, ResourceType type, long resourceId ) @@ -53,7 +53,7 @@ void release( Statement statement, ResourceType type, long resourceId ) else if ( container instanceof Relationship ) { statement.readOperations().acquireExclusive( ResourceTypes.RELATIONSHIP, ((Relationship) container).getId() ); - return new CoreAPILock(stmtSupplier, ResourceTypes.RELATIONSHIP, ((Relationship) container).getId()) + return new CoreAPILock( stmtSupplier, ResourceTypes.RELATIONSHIP, ((Relationship) container).getId() ) { @Override void release( Statement statement, ResourceType type, long resourceId ) @@ -118,7 +118,7 @@ void release( Statement statement, ResourceType type, long resourceId ) else if ( container instanceof Relationship ) { statement.readOperations().acquireShared( ResourceTypes.RELATIONSHIP, ((Relationship) container).getId() ); - return new CoreAPILock(stmtProvider, ResourceTypes.RELATIONSHIP, ((Relationship) container).getId()) + return new CoreAPILock( stmtProvider, ResourceTypes.RELATIONSHIP, ((Relationship) container).getId() ) { @Override void release( Statement statement, ResourceType type, long resourceId ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TopLevelTransaction.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TopLevelTransaction.java index 1921a2a842700..9d119a2d997a2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TopLevelTransaction.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TopLevelTransaction.java @@ -87,7 +87,7 @@ public void close() // can be retried and might be successful the next time. throw e; } - catch ( ConstraintViolationTransactionFailureException e) + catch ( ConstraintViolationTransactionFailureException e ) { throw new ConstraintViolationException( e.getMessage(), e ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/ClassicCoreSPI.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/ClassicCoreSPI.java index bbfc99e7b23d6..0744bab95439d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/ClassicCoreSPI.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/ClassicCoreSPI.java @@ -173,7 +173,7 @@ public KernelTransaction beginTransaction( KernelTransaction.Type type, Security availability.assertDatabaseAvailable(); KernelTransaction kernelTx = dataSource.kernelAPI.get().newTransaction( type, securityContext, timeout ); kernelTx.registerCloseListener( - (txId) -> dataSource.threadToTransactionBridge.unbindTransactionFromCurrentThread() ); + ( txId ) -> dataSource.threadToTransactionBridge.unbindTransactionFromCurrentThread() ); dataSource.threadToTransactionBridge.bindTransactionToCurrentThread( kernelTx ); return kernelTx; } 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 33b54f243b7b6..79bdfcbf475cb 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 @@ -116,9 +116,13 @@ public int compareTo( IdAndSource o ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } IdAndSource that = (IdAndSource) o; return compareTo( that ) == 0; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStore.java index bfb33f25beef2..d203288bcd79c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStore.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStore.java @@ -348,7 +348,7 @@ private boolean instantiateTree() throws IOException GBPTree.Monitor monitor = monitors.newMonitor( GBPTree.Monitor.class ); MutableBoolean isRebuilding = new MutableBoolean(); Header.Reader readRebuilding = - (pageCursor, length) -> isRebuilding.setValue( pageCursor.getByte() == REBUILDING ); + ( pageCursor, length ) -> isRebuilding.setValue( pageCursor.getByte() == REBUILDING ); index = new GBPTree<>( pageCache, storeFile, new LabelScanLayout(), pageSize, monitor, readRebuilding ); return isRebuilding.getValue(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanWriter.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanWriter.java index 453022a486604..3b7f8917eab5c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanWriter.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanWriter.java @@ -57,7 +57,7 @@ class NativeLabelScanWriter implements LabelScanWriter * {@link Comparator} for sorting the node id ranges, used in batches to apply updates in sorted order. */ private static final Comparator UPDATE_SORTER = - (o1, o2) -> Long.compare( o1.getNodeId(), o2.getNodeId() ); + Comparator.comparingLong( NodeLabelUpdate::getNodeId ); /** * {@link ValueMerger} used for adding label->node mappings, see {@link LabelScanValue#add(LabelScanValue)}. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/Locks.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/Locks.java index bf80e5fb41172..2f9bb5fd1fae7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/Locks.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/Locks.java @@ -132,7 +132,7 @@ interface Client extends ResourceLocker, AutoCloseable Client newClient(); /** Visit all held locks. */ - void accept(Visitor visitor); + void accept( Visitor visitor ); void close(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/ReentrantLockService.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/ReentrantLockService.java index 9dfd2a2ca69c4..884ac4c5196bb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/ReentrantLockService.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/ReentrantLockService.java @@ -85,7 +85,7 @@ protected OwnerQueueElement acquire( LockedEntity key ) } @Override - @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter") + @SuppressWarnings( "SynchronizationOnLocalVariableOrMethodParameter" ) protected void release( LockedEntity key, OwnerQueueElement ownerQueueElement ) { if ( 0 == --ownerQueueElement.count ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/logging/StoreLogService.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/logging/StoreLogService.java index 5f9e50e08ad51..cb6f3e00da334 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/logging/StoreLogService.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/logging/StoreLogService.java @@ -50,7 +50,9 @@ public static class Builder private long internalLogRotationThreshold = 0L; private long internalLogRotationDelay = 0L; private int maxInternalLogArchives = 0; - private Consumer rotationListener = (logProvider) -> {}; + private Consumer rotationListener = ( logProvider ) -> + { + }; private Map logLevels = new HashMap<>(); private Level defaultLevel = Level.INFO; @@ -99,7 +101,7 @@ public Builder withDefaultLevel( Level defaultLevel ) return this; } - public StoreLogService inLogsDirectory(FileSystemAbstraction fileSystem, File logsDir ) throws IOException + public StoreLogService inLogsDirectory( FileSystemAbstraction fileSystem, File logsDir ) throws IOException { return new StoreLogService( userLogProvider, @@ -118,7 +120,7 @@ public static Builder withRotation( long internalLogRotationThreshold, long inte return new Builder().withRotation( internalLogRotationThreshold, internalLogRotationDelay, maxInternalLogArchives, jobScheduler ); } - public static StoreLogService inLogsDirectory(FileSystemAbstraction fileSystem, File storeDir ) throws IOException + public static StoreLogService inLogsDirectory( FileSystemAbstraction fileSystem, File storeDir ) throws IOException { return new Builder().inLogsDirectory( fileSystem, storeDir ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/FieldInjections.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/FieldInjections.java index 7126ff3f56df0..ea47cbe2cab60 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/FieldInjections.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/FieldInjections.java @@ -90,7 +90,7 @@ List setters( Class cls ) throws ProcedureException for ( Field field : currentClass.getDeclaredFields() ) { //ignore synthetic fields - if (field.isSynthetic()) + if ( field.isSynthetic() ) { continue; } @@ -126,7 +126,7 @@ private FieldSetter createInjector( Class cls, Field field ) throws Procedure throw new ComponentInjectionException( Status.Procedure.ProcedureRegistrationFailed, "Unable to set up injection for procedure `%s`, the field `%s` " + "has type `%s` which is not a known injectable component.", - cls.getSimpleName(), field.getName(), field.getType()); + cls.getSimpleName(), field.getName(), field.getType() ); } MethodHandle setter = MethodHandles.lookup().unreflectSetter( field ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/MethodSignatureCompiler.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/MethodSignatureCompiler.java index 6fe99606256da..fe64d2ac5c79a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/MethodSignatureCompiler.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/MethodSignatureCompiler.java @@ -51,7 +51,7 @@ public MethodSignatureCompiler( TypeMappers typeMappers ) public List inputTypesFor( Method method ) throws ProcedureException { Type[] types = method.getGenericParameterTypes(); - List neoTypes = new ArrayList<>(types.length); + List neoTypes = new ArrayList<>( types.length ); for ( Type type : types ) { NeoValueConverter valueConverter = typeMappers.converterFor( type ); @@ -65,7 +65,7 @@ public List signatureFor( Method method ) throws ProcedureExcept { Parameter[] params = method.getParameters(); Type[] types = method.getGenericParameterTypes(); - List signature = new ArrayList<>(params.length); + List signature = new ArrayList<>( params.length ); boolean seenDefault = false; for ( int i = 0; i < params.length; i++ ) { @@ -95,7 +95,7 @@ public List signatureFor( Method method ) throws ProcedureExcept NeoValueConverter valueConverter = typeMappers.converterFor( type ); Optional defaultValue = valueConverter.defaultValue( parameter ); //it is not allowed to have holes in default values - if (seenDefault && !defaultValue.isPresent()) + if ( seenDefault && !defaultValue.isPresent() ) { throw new ProcedureException( Status.Procedure.ProcedureRegistrationFailed, "Non-default argument at position %d with name %s in method %s follows default argument. " + diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/Neo4jValue.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/Neo4jValue.java index d7e2053ae683e..1e44a740d971d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/Neo4jValue.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/Neo4jValue.java @@ -45,32 +45,32 @@ public Neo4jTypes.AnyType neo4jType() return type; } - public static Neo4jValue ntString(String value) + public static Neo4jValue ntString( String value ) { return new Neo4jValue( value, Neo4jTypes.NTString ); } - public static Neo4jValue ntInteger(long value) + public static Neo4jValue ntInteger( long value ) { return new Neo4jValue( value, Neo4jTypes.NTInteger ); } - public static Neo4jValue ntFloat(double value) + public static Neo4jValue ntFloat( double value ) { return new Neo4jValue( value, Neo4jTypes.NTFloat ); } - public static Neo4jValue ntBoolean(boolean value) + public static Neo4jValue ntBoolean( boolean value ) { return new Neo4jValue( value, Neo4jTypes.NTBoolean ); } - public static Neo4jValue ntMap(Map value) + public static Neo4jValue ntMap( Map value ) { return new Neo4jValue( value, Neo4jTypes.NTMap ); } - public static Neo4jValue ntList(List value, Neo4jTypes.AnyType inner) + public static Neo4jValue ntList( List value, Neo4jTypes.AnyType inner ) { return new Neo4jValue( value, Neo4jTypes.NTList( inner ) ); } @@ -88,14 +88,20 @@ public String toString() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } Neo4jValue that = (Neo4jValue) o; if ( value != null ? !value.equals( that.value ) : that.value != null ) - { return false; } + { + return false; + } return type.equals( that.type ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/OutputMappers.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/OutputMappers.java index 69188d686477d..963b6a20f8c55 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/OutputMappers.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/OutputMappers.java @@ -148,27 +148,27 @@ public OutputMapper mapper( Method method ) throws ProcedureException } Type genericReturnType = method.getGenericReturnType(); - if (!(genericReturnType instanceof ParameterizedType)) + if ( !(genericReturnType instanceof ParameterizedType) ) { throw new ProcedureException( Status.Procedure.TypeError, "Procedures must return a Stream of records, where a record is a concrete class%n" + - "that you define and not a raw Stream."); + "that you define and not a raw Stream." ); } ParameterizedType genType = (ParameterizedType) genericReturnType; Type recordType = genType.getActualTypeArguments()[0]; - if ( recordType instanceof WildcardType) + if ( recordType instanceof WildcardType ) { throw new ProcedureException( Status.Procedure.TypeError, "Procedures must return a Stream of records, where a record is a concrete class%n" + - "that you define and not a Stream."); + "that you define and not a Stream." ); } - if (recordType instanceof ParameterizedType) + if ( recordType instanceof ParameterizedType ) { ParameterizedType type = (ParameterizedType) recordType; throw new ProcedureException( Status.Procedure.TypeError, "Procedures must return a Stream of records, where a record is a concrete class%n" + - "that you define and not a parameterized type such as %s.", type); + "that you define and not a parameterized type such as %s.", type ); } return mapper( (Class) recordType ); @@ -235,8 +235,8 @@ private ProcedureException invalidReturnType( Class userClass ) " public %s out;%n" + "'}'%n" + "%n" + - "And then define your procedure as returning `Stream`.", - userClass.getSimpleName(), userClass.getSimpleName()); + "And then define your procedure as returning `Stream`.", userClass.getSimpleName(), + userClass.getSimpleName() ); } private List instanceFields( Class userClass ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ParseUtil.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ParseUtil.java index ce0d2a7abf3f5..a1faf52a00c0f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ParseUtil.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ParseUtil.java @@ -306,14 +306,14 @@ static List parseList( String s, Type type ) return (List) list; } - private static void assertType(Object obj, Type type) + private static void assertType( Object obj, Type type ) { - if (obj == null) + if ( obj == null ) { return; } //Since type erasure has already happened here we cannot verify ParameterizedType - if (type instanceof Class) + if ( type instanceof Class ) { Class clazz = (Class) type; if ( !clazz.isAssignableFrom( obj.getClass() ) ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ProcedureRegistry.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ProcedureRegistry.java index dc940c5f7d2ee..9d8f68a04c999 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ProcedureRegistry.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ProcedureRegistry.java @@ -211,7 +211,7 @@ public Object callFunction( Context ctx, QualifiedName name, Object[] input ) return func.apply( ctx, input ); } - public CallableUserAggregationFunction.Aggregator createAggregationFunction(Context ctx, QualifiedName name) + public CallableUserAggregationFunction.Aggregator createAggregationFunction( Context ctx, QualifiedName name ) throws ProcedureException { CallableUserAggregationFunction func = aggregationFunctions.get( name ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ReflectiveProcedureCompiler.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ReflectiveProcedureCompiler.java index d58cd39426abd..61f4999d337be 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ReflectiveProcedureCompiler.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ReflectiveProcedureCompiler.java @@ -287,7 +287,7 @@ private CallableUserFunction compileFunction( Class procDefinition, MethodHan throws ProcedureException, IllegalAccessException { - if (procName.namespace() == null || procName.namespace().length == 0) + if ( procName.namespace() == null || procName.namespace().length == 0 ) { throw new ProcedureException( Status.Procedure.ProcedureRegistrationFailed, "It is not allowed to define functions in the root namespace please use a namespace, e.g. `@UserFunction(\"org.example.com.%s\")", @@ -329,11 +329,10 @@ private CallableUserFunction compileFunction( Class procDefinition, MethodHan return new ReflectiveUserFunction( signature, constructor, procedureMethod, valueConverter, setters ); } - private CallableUserAggregationFunction compileAggregationFunction( Class definition, MethodHandle - constructor, Method method, QualifiedName funcName) - throws ProcedureException, IllegalAccessException + private CallableUserAggregationFunction compileAggregationFunction( Class definition, MethodHandle constructor, + Method method, QualifiedName funcName ) throws ProcedureException, IllegalAccessException { - if (funcName.namespace() == null || funcName.namespace().length == 0) + if ( funcName.namespace() == null || funcName.namespace().length == 0 ) { throw new ProcedureException( Status.Procedure.ProcedureRegistrationFailed, "It is not allowed to define functions in the root namespace please use a namespace, e.g. `@UserFunction(\"org.example.com.%s\")", @@ -551,7 +550,7 @@ private static class ReflectiveProcedure extends ReflectiveBase implements Calla MethodHandle procedureMethod, OutputMapper outputMapper, List fieldSetters ) { - super(fieldSetters ); + super( fieldSetters ); this.constructor = constructor; this.procedureMethod = procedureMethod; this.signature = signature; @@ -756,7 +755,7 @@ public UserFunctionSignature signature() } @Override - public Aggregator create( Context ctx) throws ProcedureException + public Aggregator create( Context ctx ) throws ProcedureException { // For now, create a new instance of the class for each invocation. In the future, we'd like to keep // instances local to diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/TypeMappers.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/TypeMappers.java index 8e951fd4756f7..7aad8c6585aa1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/TypeMappers.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/TypeMappers.java @@ -60,8 +60,10 @@ public class TypeMappers interface NeoValueConverter { AnyType type(); + Object toNeoValue( Object javaValue ) throws ProcedureException; - Optional defaultValue(Name parameter) throws ProcedureException; + + Optional defaultValue( Name parameter ) throws ProcedureException; } private final Map javaToNeo = new HashMap<>(); @@ -140,7 +142,7 @@ public void registerType( Class javaClass, NeoValueConverter toNeo ) private final NeoValueConverter TO_ANY = new SimpleConverter( NTAny, Object.class ); private final NeoValueConverter TO_STRING = new SimpleConverter( NTString, String.class, Neo4jValue::ntString ); private final NeoValueConverter TO_INTEGER = new SimpleConverter( NTInteger, Long.class, s -> ntInteger( parseLong(s) ) ); - private final NeoValueConverter TO_FLOAT = new SimpleConverter( NTFloat, Double.class, s -> ntFloat( parseDouble(s) )); + private final NeoValueConverter TO_FLOAT = new SimpleConverter( NTFloat, Double.class, s -> ntFloat( parseDouble( s ) ) ); private final NeoValueConverter TO_NUMBER = new SimpleConverter( NTNumber, Number.class, s -> { try @@ -151,14 +153,15 @@ public void registerType( Class javaClass, NeoValueConverter toNeo ) { return ntFloat( parseDouble( s ) ); } - }); - private final NeoValueConverter TO_BOOLEAN = new SimpleConverter( NTBoolean, Boolean.class, s -> ntBoolean( parseBoolean(s) )); - private final NeoValueConverter TO_MAP = new SimpleConverter( NTMap, Map.class, new MapConverter()); + } ); + private final NeoValueConverter TO_BOOLEAN = + new SimpleConverter( NTBoolean, Boolean.class, s -> ntBoolean( parseBoolean( s ) ) ); + private final NeoValueConverter TO_MAP = new SimpleConverter( NTMap, Map.class, new MapConverter() ); private final NeoValueConverter TO_LIST = toList( TO_ANY, Object.class ); private NeoValueConverter toList( NeoValueConverter inner, Type type ) { - return new SimpleConverter( NTList( inner.type() ), List.class, new ListConverter(type, inner.type() )); + return new SimpleConverter( NTList( inner.type() ), List.class, new ListConverter( type, inner.type() ) ); } private ProcedureException javaToNeoMappingError( Type cls ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/security/User.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/security/User.java index 52dcd59d8a22a..ca061df005919 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/security/User.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/security/User.java @@ -60,7 +60,7 @@ public Credential credentials() return credential; } - public boolean hasFlag(String flag) + public boolean hasFlag( String flag ) { return flags.contains( flag ); } @@ -192,7 +192,7 @@ public Builder withRequiredPasswordChange( boolean change ) public User build() { - return new User(name, credential, flags ); + return new User( name, credential, flags ); } } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/CommonAbstractStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/CommonAbstractStore.java index b0e5ab951d82f..af112192bb698 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/CommonAbstractStore.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/CommonAbstractStore.java @@ -245,8 +245,8 @@ protected void initialiseNewStoreFile( PagedFile file ) throws IOException if ( pageCursor.checkAndClearBoundsFlag() ) { throw new UnderlyingStorageException( - "Out of page bounds when writing header; page size too small: " + - pageCache.pageSize() + " bytes."); + "Out of page bounds when writing header; page size too small: " + pageCache.pageSize() + + " bytes." ); } } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/DataInconsistencyError.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/DataInconsistencyError.java index 7a952af4cfe0f..041ec55cd457f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/DataInconsistencyError.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/DataInconsistencyError.java @@ -26,6 +26,6 @@ public class DataInconsistencyError extends Error { public DataInconsistencyError( String message ) { - super(message); + super( message ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/LongerShortString.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/LongerShortString.java index fdaced1c2186a..7b1117b227dde 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/LongerShortString.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/LongerShortString.java @@ -727,7 +727,8 @@ public static boolean encode( int keyId, String string, return encodeWithCharSet( keyId, string, target, payloadSize, dataLength ); } - private static boolean encodeWithCharSet(int keyId, String string, PropertyBlock target, int payloadSize, int stringLength) + private static boolean encodeWithCharSet( int keyId, String string, PropertyBlock target, int payloadSize, + int stringLength ) { int maxBytes = PropertyType.getPayloadSize(); if ( stringLength <= maxBytes - 5 ) @@ -979,7 +980,7 @@ private static Bits newBits( LongerShortString encoding, int length ) return Bits.bits(calculateNumberOfBlocksUsed( encoding, length ) << 3 ); //*8 } - private static Bits newBitsForStep8(int length) + private static Bits newBitsForStep8( int length ) { return Bits.bits(calculateNumberOfBlocksUsedForStep8(length) << 3 ); //*8 } @@ -1030,8 +1031,7 @@ private static boolean encodeUTF8( int keyId, String string, PropertyBlock targe return true; } - private boolean doEncode(int keyId, byte[] data, PropertyBlock target, - int payloadSize, final int length) + private boolean doEncode( int keyId, byte[] data, PropertyBlock target, int payloadSize, final int length ) { if ( length > maxLength( payloadSize ) ) { @@ -1047,9 +1047,9 @@ private boolean doEncode(int keyId, byte[] data, PropertyBlock target, return true; } - private void translateData(Bits bits, byte[] data, int length, final int step) + private void translateData( Bits bits, byte[] data, int length, final int step ) { - for (int i = 0; i < length; i++) + for ( int i = 0; i < length; i++ ) { bits.put(encTranslate(data[i]), step); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/PropertyType.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/PropertyType.java index 348931986c624..c9bfa0f3a3887 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/PropertyType.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/PropertyType.java @@ -30,7 +30,7 @@ /** * Defines valid property types. */ -@SuppressWarnings("UnnecessaryBoxing") +@SuppressWarnings( "UnnecessaryBoxing" ) public enum PropertyType { BOOL( 1 ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/ShortArray.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/ShortArray.java index c05045122e3ce..75dc6fff297d8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/ShortArray.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/ShortArray.java @@ -236,7 +236,7 @@ public Object createEmptyArray() return EMPTY_SHORT_ARRAY; } }, - CHAR( PropertyType.CHAR, 16, Character.class , char.class) + CHAR( PropertyType.CHAR, 16, Character.class, char.class ) { int getRequiredBits( char value ) { @@ -314,7 +314,7 @@ public Object createEmptyArray() return EMPTY_CHAR_ARRAY; } }, - INT( PropertyType.INT, 32, Integer.class , int.class) + INT( PropertyType.INT, 32, Integer.class, int.class ) { int getRequiredBits( int value ) { @@ -392,7 +392,7 @@ public Object createEmptyArray() return EMPTY_INT_ARRAY; } }, - LONG( PropertyType.LONG, 64, Long.class , long.class) + LONG( PropertyType.LONG, 64, Long.class, long.class ) { @Override public int getRequiredBits( long value ) @@ -471,7 +471,7 @@ public Object createEmptyArray() return EMPTY_LONG_ARRAY; } }, - FLOAT( PropertyType.FLOAT, 32, Float.class ,float.class) + FLOAT( PropertyType.FLOAT, 32, Float.class, float.class ) { int getRequiredBits( float value ) { @@ -674,7 +674,7 @@ public int intValue() return type.intValue(); } - public abstract Object createArray(int length, Bits bits, int requiredBits); + public abstract Object createArray( int length, Bits bits, int requiredBits ); public static boolean encode( int keyId, Object array, PropertyBlock target, int payloadSizeInBytes ) @@ -758,7 +758,7 @@ private static boolean willFit( int requiredBits, int arrayLength, int payloadSi return totalBitsRequired <= maxBits; } - public int calculateRequiredBitsForArray(Object array, int arrayLength) + public int calculateRequiredBitsForArray( Object array, int arrayLength ) { if ( arrayLength == 0 ) { @@ -782,7 +782,7 @@ public int getRequiredBits( long value ) return highest; } - abstract int getRequiredBits(Object array, int arrayLength); + abstract int getRequiredBits( Object array, int arrayLength ); public static ShortArray typeOf( byte typeId ) { @@ -822,7 +822,7 @@ public static int calculateNumberOfBlocksUsed( int arrayLength, int requiredBits return result; } - public abstract void writeAll(Object array, int length, int requiredBits, Bits result); + public abstract void writeAll( Object array, int length, int requiredBits, Bits result ); public Object createEmptyArray() { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreAccess.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreAccess.java index 1ce349af9decf..d62f2fefdad6b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreAccess.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreAccess.java @@ -227,7 +227,7 @@ protected RecordStore wrapStore( RecordStore void apply( RecordStore.Processor processor, RecordStore store ) throws FAILURE { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/allocator/ReusableRecordsCompositeAllocator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/allocator/ReusableRecordsCompositeAllocator.java index e585a56e753ca..74db3b8d2c989 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/allocator/ReusableRecordsCompositeAllocator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/allocator/ReusableRecordsCompositeAllocator.java @@ -35,12 +35,14 @@ public class ReusableRecordsCompositeAllocator implements DynamicRecordAllocator private final ReusableRecordsAllocator reusableRecordsAllocator; private final DynamicRecordAllocator recordAllocator; - public ReusableRecordsCompositeAllocator(Collection records, DynamicRecordAllocator recordAllocator ) + public ReusableRecordsCompositeAllocator( Collection records, + DynamicRecordAllocator recordAllocator ) { - this(records.iterator(), recordAllocator); + this( records.iterator(), recordAllocator ); } - public ReusableRecordsCompositeAllocator(Iterator recordsIterator, DynamicRecordAllocator recordAllocator ) + public ReusableRecordsCompositeAllocator( Iterator recordsIterator, + DynamicRecordAllocator recordAllocator ) { this.reusableRecordsAllocator = new ReusableRecordsAllocator( recordAllocator.getRecordDataSize(), recordsIterator ); this.recordAllocator = recordAllocator; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/CountsTracker.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/CountsTracker.java index ddb8c6538f617..a82df26a4b3a2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/CountsTracker.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/CountsTracker.java @@ -71,14 +71,14 @@ * The pattern of immutable store files, and rotation strategy, et.c. is defined in the * {@code kvstore}-package, see {@link org.neo4j.kernel.impl.store.kvstore.KeyValueStoreFile} for a good entry point. */ -@Rotation(value = Rotation.Strategy.LEFT_RIGHT, parameters = {CountsTracker.LEFT, CountsTracker.RIGHT}) +@Rotation( value = Rotation.Strategy.LEFT_RIGHT, parameters = {CountsTracker.LEFT, CountsTracker.RIGHT} ) public class CountsTracker extends AbstractKeyValueStore implements CountsVisitor.Visitable, CountsAccessor { /** The format specifier for the current version of the store file format. */ private static final byte[] FORMAT = {'N', 'e', 'o', 'C', 'o', 'u', 'n', 't', 'S', 't', 'o', 'r', 'e', /**/0, 2, 'V'}; - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private static final HeaderField[] HEADER_FIELDS = new HeaderField[]{FileVersion.FILE_VERSION}; public static final String LEFT = ".a", RIGHT = ".b"; public static final String TYPE_DESCRIPTOR = "CountsStore"; @@ -308,7 +308,7 @@ protected boolean visitKeyValuePair( CountsKey key, ReadableBuffer value ) return true; } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) @Override public void visitMetadata( File path, Headers headers, int entryCount ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/keys/CountsKeyType.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/keys/CountsKeyType.java index 84aa9f5f01b00..602d15a156834 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/keys/CountsKeyType.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/keys/CountsKeyType.java @@ -34,7 +34,7 @@ public enum CountsKeyType this.code = (byte) code; } - public static CountsKeyType value(byte val) + public static CountsKeyType value( byte val ) { switch ( val ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/BaseRecordFormat.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/BaseRecordFormat.java index 48bcdf467fd59..6c4dceadd738d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/BaseRecordFormat.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/BaseRecordFormat.java @@ -40,11 +40,11 @@ public abstract class BaseRecordFormat implem { public static final int IN_USE_BIT = 0b0000_0001; public static final Function INT_STORE_HEADER_READER = - (header) -> ((IntStoreHeader)header).value(); + ( header ) -> ((IntStoreHeader) header).value(); public static Function fixedRecordSize( int recordSize ) { - return (header) -> recordSize; + return ( header ) -> recordSize; } private final Function recordSize; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/id/DefaultIdGeneratorFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/id/DefaultIdGeneratorFactory.java index 6b98c8c6659c3..44261afd25440 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/id/DefaultIdGeneratorFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/id/DefaultIdGeneratorFactory.java @@ -39,7 +39,8 @@ public DefaultIdGeneratorFactory( FileSystemAbstraction fs ) this( fs, new CommunityIdTypeConfigurationProvider() ); } - public DefaultIdGeneratorFactory( FileSystemAbstraction fs, IdTypeConfigurationProvider idTypeConfigurationProvider) + public DefaultIdGeneratorFactory( FileSystemAbstraction fs, + IdTypeConfigurationProvider idTypeConfigurationProvider ) { this.fs = fs; this.idTypeConfigurationProvider = idTypeConfigurationProvider; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/id/configuration/CommunityIdTypeConfigurationProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/id/configuration/CommunityIdTypeConfigurationProvider.java index 18d80c0f7b124..b967d5905834d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/id/configuration/CommunityIdTypeConfigurationProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/id/configuration/CommunityIdTypeConfigurationProvider.java @@ -40,7 +40,7 @@ public class CommunityIdTypeConfigurationProvider implements IdTypeConfiguration Collections.unmodifiableSet( EnumSet.of( IdType.PROPERTY, IdType.STRING_BLOCK, IdType.ARRAY_BLOCK, IdType.NODE_LABELS ) ); - private final Map typeConfigurations = new EnumMap<>(IdType.class); + private final Map typeConfigurations = new EnumMap<>( IdType.class ); @Override public IdTypeConfiguration getIdTypeConfiguration( IdType idType ) @@ -48,7 +48,7 @@ public IdTypeConfiguration getIdTypeConfiguration( IdType idType ) return typeConfigurations.computeIfAbsent( idType, this::createIdTypeConfiguration ); } - private IdTypeConfiguration createIdTypeConfiguration(IdType idType) + private IdTypeConfiguration createIdTypeConfiguration( IdType idType ) { return new IdTypeConfiguration( getTypesToReuse().contains( idType ) ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/AbstractKeyValueStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/AbstractKeyValueStore.java index a25de0608d17c..434c47e7927c9 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/AbstractKeyValueStore.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/AbstractKeyValueStore.java @@ -42,8 +42,8 @@ * * @param a base type for the keys stored in this store. */ -@Rotation(/*default strategy:*/Rotation.Strategy.LEFT_RIGHT/*(subclasses can override)*/ ) -@State(/*default strategy:*/State.Strategy.CONCURRENT_HASH_MAP/*(subclasses can override)*/ ) +@Rotation( Rotation.Strategy.LEFT_RIGHT ) +@State( State.Strategy.CONCURRENT_HASH_MAP ) public abstract class AbstractKeyValueStore extends LifecycleAdapter { private final ReadWriteLock updateLock = new ReentrantReadWriteLock( /*fair=*/true ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/BigEndianByteArrayBuffer.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/BigEndianByteArrayBuffer.java index 31c8cce6dcebc..c927d520331d6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/BigEndianByteArrayBuffer.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/BigEndianByteArrayBuffer.java @@ -130,7 +130,7 @@ public boolean minusOneAtTheEnd() } } - for ( int i = buffer.length / 2; i < buffer.length; i++) + for ( int i = buffer.length / 2; i < buffer.length; i++ ) { if ( buffer[i] != -1 ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/ConcurrentMapState.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/ConcurrentMapState.java index c33e8e3281db3..37ad2c0a5aec2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/ConcurrentMapState.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/ConcurrentMapState.java @@ -162,7 +162,7 @@ protected PrototypeState prototype( long version ) return new Prototype<>( this, version ); } - @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter") + @SuppressWarnings( "SynchronizationOnLocalVariableOrMethodParameter" ) static void applyUpdate( ReadableState store, ConcurrentMap changes, Key key, ValueUpdate update, boolean reset ) throws IOException { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/Headers.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/Headers.java index ee209239383d5..a51b3991316ad 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/Headers.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/Headers.java @@ -47,7 +47,7 @@ public final Builder put( HeaderField field, Value value ) return this; } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public final Value get( HeaderField field ) { return (Value) headers.get( field ); @@ -140,7 +140,7 @@ private static class Indexed extends Headers } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public Value get( HeaderField field ) { Integer index = indexes.get( field ); @@ -164,7 +164,7 @@ private static class Simple extends Headers } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public Value get( HeaderField field ) { return (Value) headers.get( field ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/Rotation.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/Rotation.java index 7cd1fe35bd913..2bef8a2d18859 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/Rotation.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/Rotation.java @@ -30,8 +30,8 @@ import org.neo4j.io.pagecache.PageCache; @Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) +@Target( ElementType.TYPE ) +@Retention( RetentionPolicy.RUNTIME ) public @interface Rotation { Strategy value(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/RotationState.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/RotationState.java index 2793d34c6b8b3..3b0ca7d105fa3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/RotationState.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/RotationState.java @@ -76,7 +76,7 @@ ActiveState rotate( boolean force, RotationStrategy strategy, RotationTimer if ( rotationTimer.isTimedOut() ) { throw new RotationTimeoutException( threshold, preState.store.version(), - rotationTimer.getElapsedTimeMillis()); + rotationTimer.getElapsedTimeMillis() ); } try { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/State.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/State.java index 38485cca19b5c..8bfccfc7cd512 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/State.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/State.java @@ -27,8 +27,8 @@ import java.lang.annotation.Target; @Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) +@Target( ElementType.TYPE ) +@Retention( RetentionPolicy.RUNTIME ) public @interface State { Strategy value(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/NodeRecord.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/NodeRecord.java index 36b0a410b8049..308ea5685877c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/NodeRecord.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/NodeRecord.java @@ -70,7 +70,7 @@ public NodeRecord( long id, boolean inUse, boolean dense, long nextRel, long nex @Deprecated public NodeRecord( long id, boolean dense, long nextRel, long nextProp, boolean inUse ) { - this(id, dense, nextRel, nextProp); + this( id, dense, nextRel, nextProp ); setInUse( inUse ); } @@ -175,7 +175,7 @@ public NodeRecord clone() if ( dynamicLabelRecords.size() > 0 ) { - List clonedLabelRecords = new ArrayList<>(dynamicLabelRecords.size()); + List clonedLabelRecords = new ArrayList<>( dynamicLabelRecords.size() ); for ( DynamicRecord labelRecord : dynamicLabelRecords ) { clonedLabelRecords.add( labelRecord.clone() ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/PropertyBlock.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/PropertyBlock.java index c23223d43166f..bf9c8d0708c93 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/PropertyBlock.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/PropertyBlock.java @@ -163,7 +163,7 @@ public int getSize() @Override public String toString() { - StringBuilder result = new StringBuilder("PropertyBlock["); + StringBuilder result = new StringBuilder( "PropertyBlock[" ); PropertyType type = getType(); if ( valueBlocks != null ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/RelationshipGroupRecord.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/RelationshipGroupRecord.java index 94c5ad3fa7384..4de415ebf8577 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/RelationshipGroupRecord.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/RelationshipGroupRecord.java @@ -200,19 +200,21 @@ public RelationshipGroupRecord clone() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } if ( !super.equals( o ) ) - { return false; } + { + return false; + } RelationshipGroupRecord that = (RelationshipGroupRecord) o; - return type == that.type && - next == that.next && - firstOut == that.firstOut && - firstIn == that.firstIn && - firstLoop == that.firstLoop && - owningNode == that.owningNode; - // don't compare prev since it's not persisted + return type == that.type && next == that.next && firstOut == that.firstOut && firstIn == that.firstIn && + firstLoop == that.firstLoop && owningNode == that.owningNode; + // don't compare prev since it's not persisted } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/RelationshipRecord.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/RelationshipRecord.java index 4e442375da93c..6877c6c3476fc 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/RelationshipRecord.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/RelationshipRecord.java @@ -226,21 +226,22 @@ public void setIdTo( PropertyRecord property ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } if ( !super.equals( o ) ) - { return false; } + { + return false; + } RelationshipRecord that = (RelationshipRecord) o; - return firstNode == that.firstNode && - secondNode == that.secondNode && - type == that.type && - firstPrevRel == that.firstPrevRel && - firstNextRel == that.firstNextRel && - secondPrevRel == that.secondPrevRel && - secondNextRel == that.secondNextRel && - firstInFirstChain == that.firstInFirstChain && - firstInSecondChain == that.firstInSecondChain; + return firstNode == that.firstNode && secondNode == that.secondNode && type == that.type && + firstPrevRel == that.firstPrevRel && firstNextRel == that.firstNextRel && + secondPrevRel == that.secondPrevRel && secondNextRel == that.secondNextRel && + firstInFirstChain == that.firstInFirstChain && firstInSecondChain == that.firstInSecondChain; } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/DatabaseMigrator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/DatabaseMigrator.java index 8c3946a40d63a..cc23e90d583b8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/DatabaseMigrator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/DatabaseMigrator.java @@ -78,7 +78,7 @@ public DatabaseMigrator( * migration if that is required. * @param storeDir store to migrate */ - public void migrate(File storeDir) + public void migrate( File storeDir ) { LogProvider logProvider = logService.getInternalLogProvider(); UpgradableDatabase upgradableDatabase = diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreUpgrader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreUpgrader.java index 4d8561a5f0491..91bf633f3c137 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreUpgrader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreUpgrader.java @@ -101,7 +101,7 @@ public void addParticipant( StoreMigrationParticipant participant ) this.participants.add( participant ); } - public void migrateIfNeeded( File storeDirectory) + public void migrateIfNeeded( File storeDirectory ) { File migrationDirectory = new File( storeDirectory, MIGRATION_DIRECTORY ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexLookup.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexLookup.java index 2cf4e435e6623..8d64bc81457b6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexLookup.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexLookup.java @@ -126,7 +126,7 @@ public Index getAnyIndexOrNull( final long[] labelIds, final int propertyKeyId ) return null; } IndexRule rule = findIndexRuleWithOneOfLabels( indexRules, labelIds ); - if (rule == null) + if ( rule == null ) { return null; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/PropertyDeduplicator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/PropertyDeduplicator.java index a8fde75dc2c00..1ac95239430dc 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/PropertyDeduplicator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/PropertyDeduplicator.java @@ -160,9 +160,8 @@ private void scanForDuplicates( long propertyId, Iterable propert private void resolveConflicts( final PrimitiveLongObjectMap> duplicateClusters, - PropertyStore propertyStore, - final NodeStore nodeStore, - SchemaStore schemaStore, File storeDir) throws IOException + PropertyStore propertyStore, final NodeStore nodeStore, SchemaStore schemaStore, File storeDir ) + throws IOException { if ( duplicateClusters.isEmpty() ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/LegacyIndexMigrator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/LegacyIndexMigrator.java index a254441c85c8b..c9bd4d2ab1712 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/LegacyIndexMigrator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/LegacyIndexMigrator.java @@ -128,9 +128,9 @@ private void migrateLegacyIndexes( MigrationProgressMonitor.Section progressMoni } } - private boolean isNotEmptyDirectory(File file) + private boolean isNotEmptyDirectory( File file ) { - if (fileSystem.isDirectory( file )) + if ( fileSystem.isDirectory( file ) ) { File[] files = fileSystem.listFiles( file ); return files != null && files.length > 0; 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 0cd5cf36bdd17..d1cc7da5461b7 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 @@ -682,7 +682,9 @@ private BiConsumer< { if ( !requiresPropertyMigration ) { - return (a, b) -> {}; + return ( a, b ) -> + { + }; } final StorePropertyCursor cursor = new StorePropertyCursor( cursors, ignored -> {} ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0.java index 93022ee09186f..3eec61a7e7fa9 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0.java @@ -542,7 +542,7 @@ else if ( primitiveId != -1 ) { record.setRelId( primitiveId ); } - if (hasSecondaryUnit) + if ( hasSecondaryUnit ) { record.setSecondaryUnitId( channel.getLong() ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0_2.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0_2.java index 1bc7931be2314..aae1cae465b05 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0_2.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0_2.java @@ -542,7 +542,7 @@ else if ( primitiveId != -1 ) { record.setRelId( primitiveId ); } - if (hasSecondaryUnit) + if ( hasSecondaryUnit ) { record.setSecondaryUnitId( channel.getLong() ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PositionAwarePhysicalFlushableChannel.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PositionAwarePhysicalFlushableChannel.java index a0e40f838bca7..198fa49a2bbda 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PositionAwarePhysicalFlushableChannel.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PositionAwarePhysicalFlushableChannel.java @@ -32,7 +32,7 @@ public class PositionAwarePhysicalFlushableChannel implements FlushablePositionA private LogVersionedStoreChannel logVersionedStoreChannel; private final PhysicalFlushableChannel channel; - public PositionAwarePhysicalFlushableChannel( LogVersionedStoreChannel logVersionedStoreChannel) + public PositionAwarePhysicalFlushableChannel( LogVersionedStoreChannel logVersionedStoreChannel ) { this.logVersionedStoreChannel = logVersionedStoreChannel; this.channel = new PhysicalFlushableChannel( logVersionedStoreChannel ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/ReadAheadLogChannel.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/ReadAheadLogChannel.java index 54d6008b71768..9dd221f9dc36c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/ReadAheadLogChannel.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/ReadAheadLogChannel.java @@ -37,7 +37,7 @@ public ReadAheadLogChannel( LogVersionedStoreChannel startingChannel, LogVersion public ReadAheadLogChannel( LogVersionedStoreChannel startingChannel, LogVersionBridge bridge, int readAheadSize ) { - super(startingChannel, readAheadSize); + super( startingChannel, readAheadSize ); this.bridge = bridge; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/pruning/ThresholdBasedPruneStrategy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/pruning/ThresholdBasedPruneStrategy.java index 88a2d1affc07e..26df0a57a1e9c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/pruning/ThresholdBasedPruneStrategy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/pruning/ThresholdBasedPruneStrategy.java @@ -97,7 +97,7 @@ public void prune( long upToLogVersion ) * This if statement does nothing more complicated than checking if the next-to-last log would be prunned * and simply skipping it if so. */ - if ( upper == upToLogVersion - 1) + if ( upper == upToLogVersion - 1 ) { upper--; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/Loaders.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/Loaders.java index 4ff50d3b4574e..f91f18657e0c7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/Loaders.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/Loaders.java @@ -148,7 +148,7 @@ public void ensureHeavy( NodeRecord record ) } @Override - public NodeRecord clone(NodeRecord nodeRecord) + public NodeRecord clone( NodeRecord nodeRecord ) { return nodeRecord.clone(); } @@ -193,7 +193,7 @@ public void ensureHeavy( PropertyRecord record ) } @Override - public PropertyRecord clone(PropertyRecord propertyRecord) + public PropertyRecord clone( PropertyRecord propertyRecord ) { return propertyRecord.clone(); } @@ -223,7 +223,7 @@ public void ensureHeavy( RelationshipRecord record ) } @Override - public RelationshipRecord clone(RelationshipRecord relationshipRecord) + public RelationshipRecord clone( RelationshipRecord relationshipRecord ) { return relationshipRecord.clone(); } @@ -282,7 +282,7 @@ public SchemaRecord load( Long key, SchemaRule additionalData ) @Override public void ensureHeavy( SchemaRecord records ) { - for ( DynamicRecord record : records) + for ( DynamicRecord record : records ) { store.ensureHeavy(record); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/OnlineIndexUpdates.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/OnlineIndexUpdates.java index 147a1cae185cb..eeaa0e6c6ce29 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/OnlineIndexUpdates.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/OnlineIndexUpdates.java @@ -86,7 +86,7 @@ public void feed( PrimitiveLongObjectMap> propertyCommands PrimitiveLongObjectMap nodeCommands ) { PrimitiveLongIterator nodeIds = allKeys( nodeCommands, propertyCommands ).iterator(); - while (nodeIds.hasNext()) + while ( nodeIds.hasNext() ) { long nodeId = nodeIds.next(); gatherUpdatesFor( nodeId, nodeCommands.get( nodeId ), propertyCommands.get( nodeId ) ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/RecordChanges.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/RecordChanges.java index 648f8ea807db3..f0835dd6dd1cc 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/RecordChanges.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/RecordChanges.java @@ -114,8 +114,8 @@ public RecordProxy create( KEY key, ADDITIONAL addition } RECORD record = loader.newUnused( key, additionalData ); - RecordChange change = - new RecordChange<>( recordChanges, changeCounter, key, record, loader, true, additionalData); + RecordChange change = + new RecordChange<>( recordChanges, changeCounter, key, record, loader, true, additionalData ); recordChanges.put( key, change ); return change; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/NodeStoreScan.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/NodeStoreScan.java index d73fdf21ae7b1..e3604938d57ee 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/NodeStoreScan.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/NodeStoreScan.java @@ -60,7 +60,7 @@ public NodeStoreScan( NodeStore nodeStore, LockService locks, long totalCount ) @Override public void run() throws FAILURE { - try (PrimitiveLongResourceIterator nodeIds = getNodeIdIterator()) + try ( PrimitiveLongResourceIterator nodeIds = getNodeIdIterator() ) { continueScanning = true; while ( continueScanning && nodeIds.hasNext() ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/AsOneStartBranch.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/AsOneStartBranch.java index 1f791fb8d7918..21d1055ce8520 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/AsOneStartBranch.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/AsOneStartBranch.java @@ -209,8 +209,7 @@ public boolean hasNext() @Override public TraversalBranch next() { - return new StartNodeTraversalBranch( context, AsOneStartBranch.this, nodeIterator.next(), - initialState); + return new StartNodeTraversalBranch( context, AsOneStartBranch.this, nodeIterator.next(), initialState ); } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/BidirectionalTraversalDescriptionImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/BidirectionalTraversalDescriptionImpl.java index 53988ebd61dcf..f734c0cde62dd 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/BidirectionalTraversalDescriptionImpl.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/BidirectionalTraversalDescriptionImpl.java @@ -65,9 +65,8 @@ private BidirectionalTraversalDescriptionImpl( MonoDirectionalTraversalDescripti this.maxDepth = maxDepth; } - public BidirectionalTraversalDescriptionImpl(Supplier statementFactory) + public BidirectionalTraversalDescriptionImpl( Supplier statementFactory ) { - // TODO Proper defaults. this( new MonoDirectionalTraversalDescription(), new MonoDirectionalTraversalDescription(), STANDARD, Evaluators.all(), ALTERNATING, @@ -145,8 +144,8 @@ public Traverser traverse( Node start, Node end ) public Traverser traverse( final Iterable startNodes, final Iterable endNodes ) { return new DefaultTraverser( () -> new BidirectionalTraverserIterator( - statementFactory.get(), - start, end, sideSelector, collisionPolicy, collisionEvaluator, maxDepth, startNodes, endNodes) ); + statementFactory.get(), start, end, sideSelector, collisionPolicy, collisionEvaluator, maxDepth, + startNodes, endNodes ) ); } /** diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/MonoDirectionalTraversalDescription.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/MonoDirectionalTraversalDescription.java index 844c75ca49828..8be6e42596b41 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/MonoDirectionalTraversalDescription.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/MonoDirectionalTraversalDescription.java @@ -65,7 +65,7 @@ public MonoDirectionalTraversalDescription() * significantly less performant, and only used when accessing the traversal framework via the legacy access * methods (eg. Traversal.description()). */ - this(NO_STATEMENT); + this( NO_STATEMENT ); } public MonoDirectionalTraversalDescription( Supplier statementProvider ) @@ -150,7 +150,7 @@ public TraversalDescription uniqueness( UniquenessFactory uniqueness, @Override public TraversalDescription evaluator( Evaluator evaluator ) { - return evaluator( new Evaluator.AsPathEvaluator( evaluator) ); + return evaluator( new Evaluator.AsPathEvaluator( evaluator ) ); } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/TraversalBranchImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/TraversalBranchImpl.java index 11824f68f29fd..3d7f7df672a3e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/TraversalBranchImpl.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/traversal/TraversalBranchImpl.java @@ -362,7 +362,7 @@ public int hashCode() @Override public boolean equals( Object obj ) { - if ( obj == this) + if ( obj == this ) { return true; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Bits.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Bits.java index 6c0bdd98652ef..acf026fcc1886 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Bits.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Bits.java @@ -125,7 +125,7 @@ public static long rightOverflowMask( int steps ) * * @return the underlying long values that has got all the bits applied. */ - @SuppressWarnings("EI_EXPOSE_REP") + @SuppressWarnings( "EI_EXPOSE_REP" ) public long[] getLongs() { return longs; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Cursors.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Cursors.java index 2ed512bf82bdf..969ab9d41060c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Cursors.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Cursors.java @@ -43,7 +43,7 @@ public void close() } }; - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static Cursor empty() { return (Cursor) EMPTY; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Dependencies.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Dependencies.java index 9bfb0b7c214c9..9a06712a2c962 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Dependencies.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Dependencies.java @@ -53,13 +53,13 @@ public T resolveDependency( Class type, SelectionStrategy selector ) { List options = typeDependencies.get( type ); - if (options != null) + if ( options != null ) { return selector.select( type, (Iterable) options); } // Try parent - if (parent != null) + if ( parent != null ) { DependencyResolver dependencyResolver = parent.get(); @@ -73,7 +73,7 @@ public T resolveDependency( Class type, SelectionStrategy selector ) throw new UnsatisfiedDependencyException( type ); } - public Supplier provideDependency( final Class type, final SelectionStrategy selector) + public Supplier provideDependency( final Class type, final SelectionStrategy selector ) { return () -> resolveDependency( type, selector ); } @@ -91,7 +91,7 @@ public T satisfyDependency( T dependency ) do { List deps = (List) typeDependencies.get( type ); - if (deps == null) + if ( deps == null ) { deps = new ArrayList<>( ); typeDependencies.put(type, deps); @@ -103,12 +103,13 @@ public T satisfyDependency( T dependency ) addInterfaces(interfaces, dependency); type = type.getSuperclass(); - } while (type != null); + } + while ( type != null ); return dependency; } - public void satisfyDependencies(Object... dependencies) + public void satisfyDependencies( Object... dependencies ) { for ( Object dependency : dependencies ) { @@ -121,7 +122,7 @@ private void addInterfaces( Class[] interfaces, T dependency ) for ( Class type : interfaces ) { List deps = (List) typeDependencies.get( type ); - if (deps == null) + if ( deps == null ) { deps = new ArrayList<>( ); typeDependencies.put(type, deps); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/DependenciesProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/DependenciesProxy.java index 4d5e95870ea21..e97b6f1c4d4d8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/DependenciesProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/DependenciesProxy.java @@ -44,10 +44,10 @@ public class DependenciesProxy * @param * @return */ - public static T dependencies(DependencyResolver dependencyResolver, Class dependenciesInterface) + public static T dependencies( DependencyResolver dependencyResolver, Class dependenciesInterface ) { return (T) Proxy.newProxyInstance( dependenciesInterface.getClassLoader(), new Class[]{dependenciesInterface}, - new ProxyHandler(dependencyResolver) ); + new ProxyHandler( dependencyResolver ) ); } private static class ProxyHandler @@ -65,7 +65,7 @@ public Object invoke( Object proxy, Method method, Object[] args ) throws Throwa { try { - if (method.getReturnType().equals( Supplier.class )) + if ( method.getReturnType().equals( Supplier.class ) ) { return dependencyResolver.provideDependency( (Class)((ParameterizedType) method.getGenericReturnType()).getActualTypeArguments()[0] ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/HexPrinter.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/HexPrinter.java index 2e977132b2a03..3b64ab48a6554 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/HexPrinter.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/HexPrinter.java @@ -105,7 +105,7 @@ public HexPrinter withLineNumberOffset( long offset ) return this; } - public HexPrinter withByteSeparator( String byteSeparator) + public HexPrinter withByteSeparator( String byteSeparator ) { this.byteSeparator = byteSeparator; return this; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/IoPrimitiveUtils.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/IoPrimitiveUtils.java index b66c6f9a0dea8..dfe33207b6c18 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/IoPrimitiveUtils.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/IoPrimitiveUtils.java @@ -111,7 +111,7 @@ public static boolean readAndFlip( ReadableByteChannel channel, ByteBuffer buffe { buffer.clear(); buffer.limit( bytes ); - while ( buffer.hasRemaining()) + while ( buffer.hasRemaining() ) { int read = channel.read( buffer ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/VersionedHashMap.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/VersionedHashMap.java index 35a1906661216..9692dd7a87b28 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/VersionedHashMap.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/VersionedHashMap.java @@ -103,7 +103,7 @@ public class VersionedHashMap implements Map public VersionedHashMap() { - this(16, 0.85f); + this( 16, 0.85f ); } public VersionedHashMap( int numBuckets, float resizeAtCapacity ) @@ -273,7 +273,7 @@ private Record getRecord( Object key ) return null; } - private void resize(int numBuckets) + private void resize( int numBuckets ) { if ( numBuckets >= MAX_BUCKETS ) { @@ -314,7 +314,7 @@ record = next; } - private static int hash(int h) + private static int hash( int h ) { // See: http://stackoverflow.com/questions/9335169/understanding-strange-java-hash-function h ^= (h >>> 20) ^ (h >>> 12); @@ -462,7 +462,7 @@ private class KeyIterator implements Iterator { private final Iterator> entryIterator; - private KeyIterator(Iterator> entryIterator) + private KeyIterator( Iterator> entryIterator ) { this.entryIterator = entryIterator; } @@ -490,7 +490,7 @@ private class ValueIterator implements Iterator { private final Iterator> entryIterator; - private ValueIterator(Iterator> entryIterator) + private ValueIterator( Iterator> entryIterator ) { this.entryIterator = entryIterator; } @@ -524,7 +524,7 @@ private static class Record implements Entry protected int addedInVersion; protected boolean removed = false; - Record(int hashCode, K key, V value, Record next, int addedInVersion) + Record( int hashCode, K key, V value, Record next, int addedInVersion ) { this.hashCode = hashCode; this.key = key; @@ -596,7 +596,7 @@ private static class CopiedRecord extends Record CopiedRecord( Record original, int hashCode, K key, V value, Record next, int addedInVersion ) { - super(hashCode, key, value, next, addedInVersion); + super( hashCode, key, value, next, addedInVersion ); this.original = original; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/ConcurrentAccessException.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/ConcurrentAccessException.java index b1cbe5f00151c..2371958d8d371 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/ConcurrentAccessException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/ConcurrentAccessException.java @@ -26,6 +26,6 @@ public class ConcurrentAccessException extends Exception { public ConcurrentAccessException( String msg ) { - super(msg); + super( msg ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/NoSuchEntryException.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/NoSuchEntryException.java index dd890a7e858d1..5a6ccc2bf3894 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/NoSuchEntryException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/NoSuchEntryException.java @@ -26,6 +26,6 @@ public class NoSuchEntryException extends Exception { public NoSuchEntryException( String message ) { - super(message); + super( message ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/SimpleBitSet.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/SimpleBitSet.java index 7eeb2cff5b059..ff50d61a9e205 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/SimpleBitSet.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/SimpleBitSet.java @@ -53,7 +53,7 @@ public SimpleBitSet( int size ) data = new long[capacity]; } - public boolean contains(int key) + public boolean contains( int key ) { int idx = key >>> 6; return data.length > idx && (data[idx] & ((1L << (key & 63)))) != 0; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/TimedRepository.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/TimedRepository.java index 8e5268bc3f938..ed15728e83aba 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/TimedRepository.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/TimedRepository.java @@ -209,7 +209,7 @@ public void run() } } - private void end0(KEY key, VALUE value) + private void end0( KEY key, VALUE value ) { repo.remove( key ); reaper.accept( value ); 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 a1cc038656960..0f62319c301c9 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 @@ -327,7 +327,7 @@ private class IndexStatistics private final double uniqueValuesPercentage; private final long size; - private IndexStatistics(double uniqueValuesPercentage, long size) + private IndexStatistics( double uniqueValuesPercentage, long size ) { this.uniqueValuesPercentage = uniqueValuesPercentage; this.size = size; @@ -354,7 +354,7 @@ public void putIndex( LabelSchemaDescriptor descriptor, String userDescription, ); } - indexMap.put( descriptor, new IndexStatistics(uniqueValuesPercentage, size) ); + indexMap.put( descriptor, new IndexStatistics( uniqueValuesPercentage, size ) ); } public IndexStatistics getIndex( LabelSchemaDescriptor descriptor ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java index d5a396fb08de2..5ee958a3c481f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java @@ -89,7 +89,7 @@ private void showStructure( Statement statement, DbStructureVisitor visitor ) showSchema( visitor, read ); showStatistics( visitor, read ); } - catch (KernelException e) + catch ( KernelException e ) { throw new IllegalStateException( "Kernel exception when traversing database schema structure and statistics. This is not expected to happen.", e ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/info/DiagnosticsManager.java b/community/kernel/src/main/java/org/neo4j/kernel/info/DiagnosticsManager.java index b76fe4a56b916..afcfb53d822a7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/info/DiagnosticsManager.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/info/DiagnosticsManager.java @@ -40,7 +40,7 @@ public DiagnosticsManager( Log targetLog ) { this.targetLog = targetLog; - providers.add( new DiagnosticsProvider(/*self*/) + providers.add( new DiagnosticsProvider() { @Override public String getDiagnosticsIdentifier() diff --git a/community/kernel/src/main/java/org/neo4j/kernel/internal/EmbeddedGraphDatabase.java b/community/kernel/src/main/java/org/neo4j/kernel/internal/EmbeddedGraphDatabase.java index 2fcec9b8ed07b..abcb26489c52c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/internal/EmbeddedGraphDatabase.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/internal/EmbeddedGraphDatabase.java @@ -83,8 +83,8 @@ protected EmbeddedGraphDatabase( File storeDir, create( storeDir, config, dependencies ); } - protected void create( File storeDir, Map params, - GraphDatabaseFacadeFactory.Dependencies dependencies) + protected void create( File storeDir, Map params, + GraphDatabaseFacadeFactory.Dependencies dependencies ) { GraphDatabaseDependencies newDependencies = newDependencies( dependencies ) .settingsClasses( asList( append( GraphDatabaseSettings.class, dependencies.settingsClasses() ) ) ); @@ -92,8 +92,7 @@ protected void create( File storeDir, Map params, .initFacade( storeDir, params, newDependencies, this ); } - protected void create( File storeDir, Config config, - GraphDatabaseFacadeFactory.Dependencies dependencies) + protected void create( File storeDir, Config config, GraphDatabaseFacadeFactory.Dependencies dependencies ) { GraphDatabaseDependencies newDependencies = newDependencies( dependencies ) .settingsClasses( asList( append( GraphDatabaseSettings.class, dependencies.settingsClasses() ) ) ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/internal/TransactionEventHandlers.java b/community/kernel/src/main/java/org/neo4j/kernel/internal/TransactionEventHandlers.java index ee37a714f7bee..b821212c162be 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/internal/TransactionEventHandlers.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/internal/TransactionEventHandlers.java @@ -24,7 +24,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.concurrent.CopyOnWriteArraySet; import org.neo4j.graphdb.Node; @@ -137,7 +136,7 @@ public TransactionHandlerState beforeCommit( ReadableTransactionState state, Ker } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void afterCommit( ReadableTransactionState state, KernelTransaction transaction, TransactionHandlerState handlerState ) @@ -154,7 +153,7 @@ public void afterCommit( ReadableTransactionState state, } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void afterRollback( ReadableTransactionState state, KernelTransaction transaction, TransactionHandlerState handlerState ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/monitoring/Monitors.java b/community/kernel/src/main/java/org/neo4j/kernel/monitoring/Monitors.java index 355589b3568ea..37a768aa89c5a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/monitoring/Monitors.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/monitoring/Monitors.java @@ -58,7 +58,7 @@ */ public class Monitors { - public static final AtomicBoolean FALSE = new AtomicBoolean(false); + public static final AtomicBoolean FALSE = new AtomicBoolean( false ); public interface Monitor { @@ -111,7 +111,7 @@ public synchronized T newMonitor( Class monitorClass, String... tags ) { if ( !monitoredInterfaces.containsKey( monitorClass ) ) { - monitoredInterfaces.put( monitorClass, new AtomicBoolean(false) ); + monitoredInterfaces.put( monitorClass, new AtomicBoolean( false ) ); for ( Method method : monitorClass.getMethods() ) { @@ -221,7 +221,7 @@ private void recalculateMethodListeners( Method method ) private void recalculateAllMethodListeners() { // Mark all monitored interfaces as having no listeners - monitoredInterfaces.values().forEach( (b) -> b.set( false ) ); + monitoredInterfaces.values().forEach( ( b ) -> b.set( false ) ); for ( Method method : methodMonitorListeners.keySet() ) { recalculateMethodListeners( method ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/recovery/DefaultRecoverySPI.java b/community/kernel/src/main/java/org/neo4j/kernel/recovery/DefaultRecoverySPI.java index 602500dba7247..ebaeb83ecacdb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/recovery/DefaultRecoverySPI.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/recovery/DefaultRecoverySPI.java @@ -91,7 +91,7 @@ public Visitor startRecovery() // Go and read more at {@link CommonAbstractStore#deleteIdGenerator()} storageEngine.prepareForRecoveryRequired(); - transactionsToApply = new TransactionQueue( 10_000, (first,last) -> storageEngine.apply( first, RECOVERY ) ); + transactionsToApply = new TransactionQueue( 10_000, ( first, last ) -> storageEngine.apply( first, RECOVERY ) ); recoveryVisitor = new RecoveryVisitor( transactionsToApply ); return recoveryVisitor; diff --git a/community/kernel/src/main/java/org/neo4j/procedure/Description.java b/community/kernel/src/main/java/org/neo4j/procedure/Description.java index 875b61a05043a..94c04d040d0af 100644 --- a/community/kernel/src/main/java/org/neo4j/procedure/Description.java +++ b/community/kernel/src/main/java/org/neo4j/procedure/Description.java @@ -28,7 +28,7 @@ * A procedure can optionally be annotated with a @Description("a description"). */ @Retention( RetentionPolicy.RUNTIME ) -@Target({ElementType.METHOD,ElementType.TYPE}) +@Target( {ElementType.METHOD, ElementType.TYPE} ) public @interface Description { String value(); diff --git a/community/kernel/src/main/java/org/neo4j/udc/UsageDataKey.java b/community/kernel/src/main/java/org/neo4j/udc/UsageDataKey.java index bde2fd16d1e00..042777e563f82 100644 --- a/community/kernel/src/main/java/org/neo4j/udc/UsageDataKey.java +++ b/community/kernel/src/main/java/org/neo4j/udc/UsageDataKey.java @@ -34,17 +34,17 @@ public class UsageDataKey /** When key is requested and no value exists, a default value is generated and inserted using this */ private final Supplier defaultVal; - public static UsageDataKey key(String name) + public static UsageDataKey key( String name ) { - return key(name, null); + return key( name, null ); } - public static UsageDataKey key(String name, T defaultVal) + public static UsageDataKey key( String name, T defaultVal ) { - return new UsageDataKey<>( name, singleton(defaultVal) ); + return new UsageDataKey<>( name, singleton( defaultVal ) ); } - public static UsageDataKey key(String name, Supplier defaultVal) + public static UsageDataKey key( String name, Supplier defaultVal ) { return new UsageDataKey<>( name, defaultVal ); } @@ -69,9 +69,13 @@ Type generateDefaultValue() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } UsageDataKey key = (UsageDataKey) o; 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 6d25654f5d0a6..b6826011822f1 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 @@ -1263,7 +1263,7 @@ static final class BatchedFlushStrategy implements FlushStrategy public void flush() { attempts++; - if ( attempts >= batchSize) + if ( attempts >= batchSize ) { forceFlush(); } diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/RelationshipTypeCheckerStep.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/RelationshipTypeCheckerStep.java index 4baed296eab5e..49f1c5cd95897 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/RelationshipTypeCheckerStep.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/RelationshipTypeCheckerStep.java @@ -46,9 +46,9 @@ public class RelationshipTypeCheckerStep extends ProcessorStep NEW_MUTABLE_LONG = type -> new MutableLong(); private static final Comparator> SORT_BY_COUNT_DESC = - (e1,e2) -> Long.compare( e2.getValue().longValue(), e1.getValue().longValue() ); + ( e1, e2 ) -> Long.compare( e2.getValue().longValue(), e1.getValue().longValue() ); private static final Comparator> SORT_BY_ID_DESC = - (e1,e2) -> Integer.compare( (Integer)e2.getKey(), (Integer)e1.getKey() ); + ( e1, e2 ) -> Integer.compare( (Integer) e2.getKey(), (Integer) e1.getKey() ); private final Map> typeCheckers = new ConcurrentHashMap<>(); private final BatchingRelationshipTypeTokenRepository typeTokenRepository; private RelationshipTypeDistribution distribution; @@ -75,8 +75,8 @@ protected void process( Batch batch, Batch protected void done() { Map mergedTypes = new HashMap<>(); - typeCheckers.forEach( (thread,localTypes) -> - localTypes.forEach( (type,localCount) -> + typeCheckers.forEach( ( thread, localTypes ) -> + localTypes.forEach( ( type, localCount ) -> mergedTypes.computeIfAbsent( type, t -> new MutableLong() ).add( localCount.longValue() ) ) ); Map.Entry[] sortedTypes = mergedTypes.entrySet().toArray( new Map.Entry[mergedTypes.size()] ); diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCache.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCache.java index 7fc56c286e814..0e924bd3d2116 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCache.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCache.java @@ -22,14 +22,12 @@ import org.apache.commons.lang3.mutable.MutableLong; import java.util.Arrays; - import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; - +import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -555,7 +553,7 @@ public interface GroupVisitor long visit( long nodeId, int typeId, long out, long in, long loop ); } - public static final GroupVisitor NO_GROUP_VISITOR = (nodeId, typeId, out, in, loop) -> -1; + public static final GroupVisitor NO_GROUP_VISITOR = ( nodeId, typeId, out, in, loop ) -> -1; private class RelGroupCache implements AutoCloseable, MemoryStatsVisitor.Visitable { diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/BadCollector.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/BadCollector.java index 31ebc497e6b2a..e08090e33eda2 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/BadCollector.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/BadCollector.java @@ -64,7 +64,7 @@ private interface ProblemReporter public BadCollector( OutputStream out, int tolerance, int collect ) { - this(out, tolerance, collect, false); + this( out, tolerance, collect, false ); } public BadCollector( OutputStream out, int tolerance, int collect, boolean skipBadEntriesLogging ) diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/InputEntityReader.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/InputEntityReader.java index 23e3558f850be..bab3747d3faef 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/InputEntityReader.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/InputEntityReader.java @@ -109,7 +109,7 @@ public ProcessorState( byte[] batchData ) /** The processor is the guy converting the byte[] to ENTITY[] * we will have a lot of those guys */ - BiFunction processor = (batchData,ignore) -> + BiFunction processor = ( batchData, ignore ) -> { ProcessorState state = new ProcessorState( batchData ); try diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/MissingRelationshipDataException.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/MissingRelationshipDataException.java index ef09be387009d..7b72b0e7eadb2 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/MissingRelationshipDataException.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/MissingRelationshipDataException.java @@ -25,7 +25,7 @@ public class MissingRelationshipDataException extends DataException { private Type fieldType; - public MissingRelationshipDataException(Type missedField, String message ) + public MissingRelationshipDataException( Type missedField, String message ) { super( message ); this.fieldType = missedField; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/csv/DeserializerFactories.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/csv/DeserializerFactories.java index 5809f63ed98c7..a771ca9055051 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/csv/DeserializerFactories.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/csv/DeserializerFactories.java @@ -33,7 +33,7 @@ public class DeserializerFactories public static DeserializerFactory defaultNodeDeserializer( Groups groups, Configuration config, IdType idType, Collector badCollector ) { - return (header,stream,decorator,validator) -> + return ( header, stream, decorator, validator ) -> { InputNodeDeserialization deserialization = new InputNodeDeserialization( header, stream, groups, idType.idsAreExternal() ); @@ -45,7 +45,7 @@ public static DeserializerFactory defaultNodeDeserializer( public static DeserializerFactory defaultRelationshipDeserializer( Groups groups, Configuration config, IdType idType, Collector badCollector ) { - return (header,stream,decorator,validator) -> + return ( header, stream, decorator, validator ) -> { InputRelationshipDeserialization deserialization = new InputRelationshipDeserialization( header, stream, groups ); diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/csv/InputRelationshipValidator.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/csv/InputRelationshipValidator.java index 0bd7b91060c91..cee0e016e29d4 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/csv/InputRelationshipValidator.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/csv/InputRelationshipValidator.java @@ -30,18 +30,16 @@ public void validate( InputRelationship entity ) { if ( entity.startNode() == null ) { - throw new MissingRelationshipDataException(Type.START_ID, - entity + " is missing " + Type.START_ID + " field" ); + throw new MissingRelationshipDataException( Type.START_ID, + entity + " is missing " + Type.START_ID + " field" ); } if ( entity.endNode() == null ) { - throw new MissingRelationshipDataException(Type.END_ID, - entity + " is missing " + Type.END_ID + " field" ); + throw new MissingRelationshipDataException( Type.END_ID, entity + " is missing " + Type.END_ID + " field" ); } if ( !entity.hasTypeId() && entity.type() == null ) { - throw new MissingRelationshipDataException(Type.TYPE, - entity + " is missing " + Type.TYPE + " field" ); + throw new MissingRelationshipDataException( Type.TYPE, entity + " is missing " + Type.TYPE + " field" ); } } } diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/csv/ParallelInputEntityDeserializer.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/csv/ParallelInputEntityDeserializer.java index 36416f6d9eb10..957334a4b5c25 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/csv/ParallelInputEntityDeserializer.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/csv/ParallelInputEntityDeserializer.java @@ -93,7 +93,7 @@ public ParallelInputEntityDeserializer( Data data, Header.Factory header boolean deferredValidation = decorator.isMutable(); Decorator batchDecorator = deferredValidation ? noDecorator() : decorator; Validator batchValidator = deferredValidation ? emptyValidator() : validator; - processing = new TicketedProcessing<>( "Parallel input parser", maxProcessors, (seeker, header) -> + processing = new TicketedProcessing<>( "Parallel input parser", maxProcessors, ( seeker, header ) -> { // Create a local deserializer for this chunk with NO decoration/validation, // this will happen in an orderly fashion in our post-processor below and done like this diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/ConstraintCreatorFacadeMethods.java b/community/kernel/src/test/java/org/neo4j/graphdb/ConstraintCreatorFacadeMethods.java index 8e3b723316f5d..9f796e0512aa1 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/ConstraintCreatorFacadeMethods.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/ConstraintCreatorFacadeMethods.java @@ -27,7 +27,7 @@ public class ConstraintCreatorFacadeMethods { private static final FacadeMethod UNIQUE = - new FacadeMethod( "ConstraintCreator unique()") + new FacadeMethod( "ConstraintCreator unique()" ) { @Override public void call( ConstraintCreator self ) diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/CreateAndDeleteNodesIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/CreateAndDeleteNodesIT.java index 7dc2d9908db3a..f16a63de159e0 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/CreateAndDeleteNodesIT.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/CreateAndDeleteNodesIT.java @@ -43,7 +43,7 @@ public void addingALabelUsingAValidIdentifierShouldSucceed() throws Exception Node myNode; // When - try (Transaction bobTransaction = dataBase.beginTx()) + try ( Transaction bobTransaction = dataBase.beginTx() ) { myNode = dataBase.createNode(); myNode.setProperty( "Name", "Bob" ); diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreUpdateIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreUpdateIT.java index 42513b10e6006..12f5f1c1bab0f 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreUpdateIT.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreUpdateIT.java @@ -19,8 +19,8 @@ */ package org.neo4j.graphdb; -import org.junit.Before; import org.hamcrest.Matchers; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; @@ -30,6 +30,7 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.helpers.collection.Iterators; + import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; @@ -276,9 +277,9 @@ private void addLabels( Node node, Label... labels ) } } - private Node getNodeById(long id) + private Node getNodeById( long id ) { - try (Transaction ignored = db().beginTx()) + try ( Transaction ignored = db().beginTx() ) { return db().getNodeById( id ); } diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java b/community/kernel/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java index b6a0ae9e4a126..40b8ce679a9e4 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java @@ -26,7 +26,7 @@ import static org.neo4j.graphdb.Label.label; import static org.neo4j.graphdb.RelationshipType.withName; -@SuppressWarnings("UnusedDeclaration") +@SuppressWarnings( "UnusedDeclaration" ) public class NodeFacadeMethods { private static final RelationshipType FOO = withName( "foo" ); diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/QueryExecutionTypeTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/QueryExecutionTypeTest.java index 52aabef65d937..4f0cf5a92ccf3 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/QueryExecutionTypeTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/QueryExecutionTypeTest.java @@ -37,10 +37,10 @@ import static org.neo4j.graphdb.QueryExecutionType.profiled; import static org.neo4j.graphdb.QueryExecutionType.query; -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class QueryExecutionTypeTest { - @Parameterized.Parameters(name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static List cases() { return Arrays.asList( diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java b/community/kernel/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java index 82663b803ddda..f0a5a02090a91 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java @@ -23,7 +23,7 @@ import static java.util.Collections.unmodifiableCollection; import static org.neo4j.graphdb.RelationshipType.withName; -@SuppressWarnings("UnusedDeclaration") +@SuppressWarnings( "UnusedDeclaration" ) public class RelationshipFacadeMethods { private static final FacadeMethod HAS_PROPERTY = @@ -131,7 +131,7 @@ public void call( Relationship relationship ) private static final FacadeMethod GET_NODES = new FacadeMethod( "Node[] getNodes()" ) { - @SuppressWarnings("UnusedDeclaration") + @SuppressWarnings( "UnusedDeclaration" ) @Override public void call( Relationship relationship ) { diff --git a/community/kernel/src/test/java/org/neo4j/helpers/HostnamePortTest.java b/community/kernel/src/test/java/org/neo4j/helpers/HostnamePortTest.java index 147c7048fb884..2575c956d8b05 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/HostnamePortTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/HostnamePortTest.java @@ -150,7 +150,7 @@ public void testMatchesUnknownHosts() throws Exception { InetAddress.getByName( unknownHost1 ); } - catch ( UnknownHostException e) + catch ( UnknownHostException e ) { unknownHost1Unknown = true; } @@ -160,7 +160,7 @@ public void testMatchesUnknownHosts() throws Exception { InetAddress.getByName( unknownHost2 ); } - catch ( UnknownHostException e) + catch ( UnknownHostException e ) { unknownHost2Unknown = true; } @@ -265,7 +265,7 @@ public void testMatchesIPWithHost() throws Exception { InetAddress.getByName( hostname2 ); } - catch ( UnknownHostException e) + catch ( UnknownHostException e ) { host2Known = false; } @@ -347,7 +347,7 @@ public void testMatchesKnownHostWithHost() throws Exception { InetAddress.getByName( host2 ); } - catch ( UnknownHostException e) + catch ( UnknownHostException e ) { host2Known = false; } @@ -462,7 +462,7 @@ public void testMatchesNullHostWithUnknownHost() throws Exception { InetAddress.getByName( unknownHost ); } - catch ( UnknownHostException e) + catch ( UnknownHostException e ) { unknownHostUnknown = true; } diff --git a/community/kernel/src/test/java/org/neo4j/helpers/ServiceTest.java b/community/kernel/src/test/java/org/neo4j/helpers/ServiceTest.java index 0c29f05e5f13a..d355f922fd5a6 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/ServiceTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/ServiceTest.java @@ -98,7 +98,7 @@ private static final class ServiceBlockClassLoader extends ClassLoader ServiceBlockClassLoader( ClassLoader parent ) { - super(parent); + super( parent ); } @Override @@ -126,7 +126,7 @@ private static final class ServiceRedirectClassLoader extends ClassLoader ServiceRedirectClassLoader( ClassLoader parent ) { - super(parent); + super( parent ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/GraphDatabaseFacadeFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/GraphDatabaseFacadeFactoryTest.java index 94b32c044a52b..85a3a3b2164e9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/GraphDatabaseFacadeFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/GraphDatabaseFacadeFactoryTest.java @@ -118,7 +118,7 @@ public void shouldThrowAppropriateExceptionIfBothStartAndShutdownFail() private GraphDatabaseFacadeFactory newFaultyGraphDatabaseFacadeFactory( final RuntimeException startupError ) { return new GraphDatabaseFacadeFactory( DatabaseInfo.UNKNOWN, - (p) -> Mockito.mock( EditionModule.class, Mockito.RETURNS_DEEP_STUBS )) + ( p ) -> Mockito.mock( EditionModule.class, Mockito.RETURNS_DEEP_STUBS ) ) { @Override protected PlatformModule createPlatform( File storeDir, Config config, diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/exceptions/index/IndexPopulationFailedKernelExceptionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/exceptions/index/IndexPopulationFailedKernelExceptionTest.java index d5dd3972f6fe3..071fc7f97225e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/exceptions/index/IndexPopulationFailedKernelExceptionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/exceptions/index/IndexPopulationFailedKernelExceptionTest.java @@ -45,7 +45,7 @@ public void shouldHandleMultiplePropertiesInConstructor1() // When IndexPopulationFailedKernelException index = - new IndexPopulationFailedKernelException( descriptor, "INDEX", new RuntimeException( )); + new IndexPopulationFailedKernelException( descriptor, "INDEX", new RuntimeException() ); // Then assertThat(index.getUserMessage( lookup ), equalTo( @@ -65,7 +65,7 @@ public void shouldHandleMultiplePropertiesInConstructor2() // When IndexPopulationFailedKernelException index = - new IndexPopulationFailedKernelException( descriptor, "INDEX", "an act of pure evil occurred"); + new IndexPopulationFailedKernelException( descriptor, "INDEX", "an act of pure evil occurred" ); // Then assertThat(index.getUserMessage( lookup ), equalTo( diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreTest.java index 8fcf0c49bdd2b..79c8c28ffb3b4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreTest.java @@ -140,7 +140,7 @@ public void snapshotReadOnlyLabelScanStore() throws IOException { prepareIndex(); createAndStartReadOnly(); - try (ResourceIterator indexFiles = store.snapshotStoreFiles()) + try ( ResourceIterator indexFiles = store.snapshotStoreFiles() ) { List filesNames = indexFiles.stream().map( File::getName ).collect( toList() ); assertThat( "Should have at least index segment file.", filesNames, hasBareMinimumFileList() ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaConstraintProviderApprovalTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaConstraintProviderApprovalTest.java index 5eec1d51f4e29..88fc99dfa2eb6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaConstraintProviderApprovalTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaConstraintProviderApprovalTest.java @@ -53,7 +53,7 @@ * Indexes should always produce the same result as scanning all nodes and checking properties. By extending this * class in the index provider module, all value types will be checked against the index provider. */ -@RunWith(value = Parameterized.class) +@RunWith( value = Parameterized.class ) public abstract class SchemaConstraintProviderApprovalTest { // These are the values that will be checked. @@ -111,7 +111,7 @@ public SchemaConstraintProviderApprovalTest( TestValue value ) currentValue = value; } - @Parameters(name = "{0}") + @Parameters( name = "{0}" ) public static Collection data() { return Arrays.asList( TestValue.values() ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaIndexProviderApprovalTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaIndexProviderApprovalTest.java index 8ae25c9591815..724f4b4ddbe7b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaIndexProviderApprovalTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaIndexProviderApprovalTest.java @@ -53,7 +53,7 @@ * Indexes should always produce the same result as scanning all nodes and checking properties. By extending this * class in the index provider module, all value types will be checked against the index provider. */ -@RunWith(value = Parameterized.class) +@RunWith( value = Parameterized.class ) public abstract class SchemaIndexProviderApprovalTest { // These are the values that will be checked. @@ -115,7 +115,7 @@ public SchemaIndexProviderApprovalTest( TestValue value ) currentValue = value; } - @Parameters(name = "{0}") + @Parameters( name = "{0}" ) public static Collection data() { return Arrays.asList( TestValue.values() ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java index 4e9eed30cfd31..d07e7e1f54aa6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java @@ -204,7 +204,6 @@ public void onlineConstraintShouldNotFalselyCollideOnFindNodesByLabelAndProperty assertLookupNode( COLLISION_Y, is( m ) ) ); } - // Replaces UniqueIAC: shouldConsiderWholeTransactionForValidatingUniqueness @Test public void onlineConstraintShouldNotConflictOnIntermediateStatesInSameTransaction() { @@ -223,7 +222,6 @@ public void onlineConstraintShouldNotConflictOnIntermediateStatesInSameTransacti assertLookupNode( "b", is( a ) ) ); } - // Replaces UniqueIAC: shouldRejectChangingEntryToAlreadyIndexedValue @Test( expected = ConstraintViolationException.class ) public void onlineConstraintShouldRejectChangingEntryToAlreadyIndexedValue() { @@ -240,8 +238,7 @@ public void onlineConstraintShouldRejectChangingEntryToAlreadyIndexedValue() fail( "Changing a property to an already indexed value should have thrown" ) ); } - // Replaces UniqueIPC: should*EnforceUnqieConstraintsAgainstDataAddedInSameTx - @Test( expected = ConstraintViolationException.class) + @Test( expected = ConstraintViolationException.class ) public void onlineConstraintShouldRejectConflictsInTheSameTransaction() throws Exception { // Given @@ -871,7 +868,7 @@ public void accept( Transaction transaction ) private Action setProperty( final Node node, final Object value ) { - return new Action( reprNode( node ) + ".setProperty( property, " + reprValue( value ) + " );") + return new Action( reprNode( node ) + ".setProperty( property, " + reprValue( value ) + " );" ) { @Override public void accept( Transaction transaction ) @@ -883,7 +880,7 @@ public void accept( Transaction transaction ) private Action removeProperty( final Node node ) { - return new Action( reprNode( node ) + ".removeProperty( property );") + return new Action( reprNode( node ) + ".removeProperty( property );" ) { @Override public void accept( Transaction transaction ) @@ -907,7 +904,7 @@ public void accept( Transaction transaction ) private Action fail( final String message ) { - return new Action( "fail( \"" + message + "\" );") + return new Action( "fail( \"" + message + "\" );" ) { @Override public void accept( Transaction transaction ) @@ -973,7 +970,7 @@ private LockService getLockService() private T resolveInternalDependency( Class type ) { - @SuppressWarnings("deprecation") + @SuppressWarnings( "deprecation" ) GraphDatabaseAPI api = (GraphDatabaseAPI) db; DependencyResolver resolver = api.getDependencyResolver(); return resolver.resolveDependency( type ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/properties/PropertyConversionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/properties/PropertyConversionTest.java index fb64ca8634844..55497db729108 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/properties/PropertyConversionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/properties/PropertyConversionTest.java @@ -42,7 +42,7 @@ public void shouldConvertStringProperty() throws Exception } @Test - @SuppressWarnings("UnnecessaryBoxing") + @SuppressWarnings( "UnnecessaryBoxing" ) public void shouldConvertSmallLongProperty() throws Exception { assertConverts( Long.valueOf( 1 + random.nextInt( 1024 ) ) ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/properties/PropertyEqualityTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/properties/PropertyEqualityTest.java index 8194bfd043df2..2a4693a1533f4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/properties/PropertyEqualityTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/properties/PropertyEqualityTest.java @@ -29,10 +29,10 @@ import static org.junit.Assert.assertTrue; import static org.neo4j.helpers.collection.Iterables.asIterable; -@RunWith(value = Parameterized.class) +@RunWith( value = Parameterized.class ) public class PropertyEqualityTest { - @Parameterized.Parameters(name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static Iterable data() { return asIterable( diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/query/ExecutingQueryStatusTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/query/ExecutingQueryStatusTest.java index 263bafb10cda5..117312a32f4e2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/query/ExecutingQueryStatusTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/query/ExecutingQueryStatusTest.java @@ -19,20 +19,19 @@ */ package org.neo4j.kernel.api.query; +import org.junit.Test; + import java.time.ZonedDateTime; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.junit.Test; - import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracer; import org.neo4j.kernel.impl.locking.ActiveLock; import org.neo4j.resources.HeapAllocation; import org.neo4j.storageengine.api.lock.ResourceType; import org.neo4j.storageengine.api.lock.WaitStrategy; import org.neo4j.test.FakeCpuClock; -import org.neo4j.test.FakeHeapAllocation; import org.neo4j.time.Clocks; import org.neo4j.time.FakeClock; @@ -119,7 +118,7 @@ public void shouldProduceSensibleMapRepresentationInWaitingOnQueryState() throws assertEquals( expected, statusMap ); } - static ResourceType resourceType(String name ) + static ResourceType resourceType( String name ) { return new ResourceType() { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/configuration/GroupConfigTest.java b/community/kernel/src/test/java/org/neo4j/kernel/configuration/GroupConfigTest.java index 1a7bb85c04128..cbbf4174e3696 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/configuration/GroupConfigTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/configuration/GroupConfigTest.java @@ -42,7 +42,7 @@ static ConnectorExample connector( int key ) return new ConnectorExample( Integer.toString(key) ); } - @Group("dbms.connector") + @Group( "dbms.connector" ) static class ConnectorExample { public final Setting enabled; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/configuration/TestGraphDatabaseConfigurationMigrator.java b/community/kernel/src/test/java/org/neo4j/kernel/configuration/TestGraphDatabaseConfigurationMigrator.java index 1411eefd9ed6a..9e46c27d0ce2f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/configuration/TestGraphDatabaseConfigurationMigrator.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/configuration/TestGraphDatabaseConfigurationMigrator.java @@ -163,7 +163,7 @@ private void assertContainsWarningMessage() logProvider.assertContainsMessageContaining( "WARNING! Deprecated configuration options used. See manual for details" ); } - private void assertContainsWarningMessage(String deprecationMessage) + private void assertContainsWarningMessage( String deprecationMessage ) { assertContainsWarningMessage(); if ( StringUtils.isNotEmpty( deprecationMessage ) ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataAndSchemaTransactionSeparationIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataAndSchemaTransactionSeparationIT.java index 08d2c8e40e2e0..33ad41cd8b511 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataAndSchemaTransactionSeparationIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataAndSchemaTransactionSeparationIT.java @@ -97,7 +97,7 @@ public void shouldNotAllowRelationshipCreationInSchemaTransaction() throws Excep } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldNotAllowPropertyWritesInSchemaTransaction() throws Exception { // given @@ -115,7 +115,7 @@ public void shouldNotAllowPropertyWritesInSchemaTransaction() throws Exception } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldAllowPropertyReadsInSchemaTransaction() throws Exception { // given diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java index 39fb845624a91..0e10d52fa4514 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java @@ -194,7 +194,7 @@ private void awaitSchemaStateCleared( String keyForProbing ) throws TransactionF try ( KernelTransaction transaction = kernel.newTransaction( KernelTransaction.Type.implicit, AUTH_DISABLED ); Statement statement = transaction.acquireStatement() ) { - while ( statement.readOperations().schemaStateGetOrCreate( keyForProbing, (ignored) -> null ) != null ) + while ( statement.readOperations().schemaStateGetOrCreate( keyForProbing, ( ignored ) -> null ) != null ) { LockSupport.parkNanos( MILLISECONDS.toNanos( 10 ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java index f4a5350b6b9e8..6359e7fcbce7c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java @@ -40,7 +40,7 @@ public class KernelStatementTest { - @Test(expected = TransactionTerminatedException.class) + @Test( expected = TransactionTerminatedException.class ) public void shouldThrowTerminateExceptionWhenTransactionTerminated() throws Exception { KernelTransactionImplementation transaction = mock( KernelTransactionImplementation.class ); @@ -70,7 +70,7 @@ public void shouldReleaseStorageStatementWhenForceClosed() throws Exception verify( storeStatement ).release(); } - @Test(expected = NotInTransactionException.class) + @Test( expected = NotInTransactionException.class ) public void assertStatementIsNotOpenWhileAcquireIsNotInvoked() { KernelTransactionImplementation transaction = mock( KernelTransactionImplementation.class ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTest.java index db62d976a1d9d..2fc497a7ad2ba 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTest.java @@ -72,7 +72,7 @@ public void shouldNotAllowCreationOfConstraintsWhenInHA() throws Exception db.shutdown(); } - @SuppressWarnings("deprecation") + @SuppressWarnings( "deprecation" ) class FakeHaDatabase extends ImpermanentGraphDatabase { @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java index 5c367f512cf95..b412e76ed3bb9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java @@ -401,7 +401,7 @@ public void shouldNotLeakTransactionOnSecurityContextFreezeFailure() throws Thro { KernelTransactions kernelTransactions = newKernelTransactions(); SecurityContext securityContext = mock(SecurityContext.class); - when(securityContext.freeze()).thenThrow(new AuthorizationExpiredException("Freeze failed.")); + when( securityContext.freeze() ).thenThrow( new AuthorizationExpiredException( "Freeze failed." ) ); assertException(() -> kernelTransactions.newInstance(KernelTransaction.Type.explicit, securityContext, 0L), AuthorizationExpiredException.class, "Freeze failed."); @@ -461,7 +461,7 @@ private void stopKernelTransactions( KernelTransactions kernelTransactions ) } } - private static void startAndCloseTransaction(KernelTransactions kernelTransactions) + private static void startAndCloseTransaction( KernelTransactions kernelTransactions ) { try { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/PropertyValueComparisonTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/PropertyValueComparisonTest.java index f26ebf474f35b..22f50ca6df75c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/PropertyValueComparisonTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/PropertyValueComparisonTest.java @@ -146,9 +146,7 @@ public void shouldOrderValuesCorrectly() int cmpPos = sign( i - j ); int cmpVal = sign( compare( COMPARE_VALUES, left, right ) ); -// System.out.println( format( "%s (%d), %s (%d) => %d (%d)", left, i, right, j, cmpLeft, i - j ) ); - - if ( cmpPos != cmpVal) + if ( cmpPos != cmpVal ) { throw new AssertionError( format( "Comparing %s against %s does not agree with their positions in the sorted list (%d and " + diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/SchemaLoggingIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/SchemaLoggingIT.java index 0cc6433cf6fbb..ffca0da3b2cdd 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/SchemaLoggingIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/SchemaLoggingIT.java @@ -61,7 +61,7 @@ public void shouldLogUserReadableLabelAndPropertyNames() throws Exception ); } - private void createIndex( @SuppressWarnings("deprecation") GraphDatabaseAPI db, String labelName, String property ) + private void createIndex( GraphDatabaseAPI db, String labelName, String property ) { try ( Transaction tx = db.beginTx() ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessIT.java index c9ea67bc892dc..3985cc744c707 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessIT.java @@ -116,7 +116,7 @@ private void randomSleep() neoStores.getMetaDataStore().getLastClosedTransactionId(), neoStores.getCounts().txId() ); } - private T getDependency(Class clazz) + private T getDependency( Class clazz ) { return db.getDependencyResolver().resolveDependency( clazz ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ContractCheckingIndexProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ContractCheckingIndexProxyTest.java index 160cd97a2cfb1..ea06b94c1e6f8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ContractCheckingIndexProxyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ContractCheckingIndexProxyTest.java @@ -107,7 +107,7 @@ public void shouldCloseAfterCreate() throws IOException outer.close(); } - @Test(expected = IllegalStateException.class) + @Test( expected = IllegalStateException.class ) public void shouldNotUpdateBeforeCreate() throws Exception { // GIVEN @@ -115,13 +115,13 @@ public void shouldNotUpdateBeforeCreate() throws Exception IndexProxy outer = newContractCheckingIndexProxy( inner ); // WHEN - try (IndexUpdater updater = outer.newUpdater( IndexUpdateMode.ONLINE ) ) + try ( IndexUpdater updater = outer.newUpdater( IndexUpdateMode.ONLINE ) ) { updater.process( null ); } } - @Test(expected = IllegalStateException.class) + @Test( expected = IllegalStateException.class ) public void shouldNotUpdateAfterClose() throws Exception { // GIVEN @@ -131,13 +131,13 @@ public void shouldNotUpdateAfterClose() throws Exception // WHEN outer.start(); outer.close(); - try (IndexUpdater updater = outer.newUpdater( IndexUpdateMode.ONLINE )) + try ( IndexUpdater updater = outer.newUpdater( IndexUpdateMode.ONLINE ) ) { updater.process( null ); } } - @Test(expected = IllegalStateException.class) + @Test( expected = IllegalStateException.class ) public void shouldNotForceBeforeCreate() throws IOException { // GIVEN @@ -148,7 +148,7 @@ public void shouldNotForceBeforeCreate() throws IOException outer.force(); } - @Test(expected = IllegalStateException.class) + @Test( expected = IllegalStateException.class ) public void shouldNotForceAfterClose() throws IOException { // GIVEN @@ -238,7 +238,7 @@ public IndexUpdater newUpdater( IndexUpdateMode mode ) // WHEN runInSeparateThread( () -> { - try (IndexUpdater updater = outer.newUpdater( IndexUpdateMode.ONLINE )) + try ( IndexUpdater updater = outer.newUpdater( IndexUpdateMode.ONLINE ) ) { updater.process( null ); latch.startAndWaitForAllToStartAndFinish(); @@ -277,7 +277,7 @@ public void force() outer.start(); // WHEN - runInSeparateThread( () -> outer.force() ); + runInSeparateThread( outer::force ); try { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxyTest.java index 6b3be4c686458..5b86b0e0fb2fc 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxyTest.java @@ -56,7 +56,7 @@ public void shouldBeAbleToSwitchDelegate() throws Exception // GIVEN IndexProxy actual = mockIndexProxy(); IndexProxy other = mockIndexProxy(); - FlippableIndexProxy delegate = new FlippableIndexProxy(actual); + FlippableIndexProxy delegate = new FlippableIndexProxy( actual ); delegate.setFlipTarget( singleProxy( other ) ); // WHEN diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java index 49add7d924cce..997e8067ea9ae 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java @@ -164,7 +164,7 @@ private Node createNode( Map properties, Label ... labels ) } } - @SuppressWarnings("deprecation") + @SuppressWarnings( "deprecation" ) @Before public void before() throws Exception { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapTest.java index a96beb8ac0b8f..1f59fa1ee2640 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapTest.java @@ -122,7 +122,7 @@ public void shouldHandleUnrelated() // HELPERS - private long[] label( long... labels) + private long[] label( long... labels ) { return labels; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java index 4a02bc89da31c..2ee00ae6e06b5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java @@ -222,7 +222,7 @@ public void shouldIndexConcurrentUpdatesWhilePopulating() throws Exception long node1 = createNode( map( name, value1 ), FIRST ); long node2 = createNode( map( name, value2 ), FIRST ); long node3 = createNode( map( name, value3 ), FIRST ); - @SuppressWarnings("UnnecessaryLocalVariable") + @SuppressWarnings( "UnnecessaryLocalVariable" ) long changeNode = node1; int propertyKeyId = getPropertyKeyForName( name ); NodeChangingWriter populator = new NodeChangingWriter( changeNode, propertyKeyId, value1, changedValue, diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java index e289387d8d2d6..97a0cb7f806aa 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java @@ -262,7 +262,7 @@ public void setUp() .thenReturn( StoreMigrationParticipant.NOT_PARTICIPATING ); } - @SuppressWarnings("deprecation") + @SuppressWarnings( "deprecation" ) private void startDb() { if ( db != null ) @@ -379,7 +379,7 @@ public IndexUpdater newUpdater( final IndexUpdateMode mode ) @Override public void close() throws IOException, IndexEntryConflictException { - switch (mode) + switch ( mode ) { case ONLINE: regularUpdates.addAll( updates ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java index c995c0af7e1f7..e12f9695195a8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java @@ -148,7 +148,7 @@ public void shouldHandleRestartIndexThatHasNotComeOnlineYet() throws Exception private IndexDefinition createIndex() { - try (Transaction tx = db.beginTx()) + try ( Transaction tx = db.beginTx() ) { IndexDefinition index = db.schema().indexFor( myLabel ).on( "number_of_bananas_owned" ).create(); tx.success(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java index dc5cf7140a8a8..c9e2d6321184e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java @@ -97,7 +97,7 @@ public class IndexStatisticsTest private ThreadToStatementContextBridge bridge; private final IndexOnlineMonitor indexOnlineMonitor = new IndexOnlineMonitor(); - @Parameters(name = "multiThreadedIndexPopulationEnabled = {0}") + @Parameters( name = "multiThreadedIndexPopulationEnabled = {0}" ) public static Object[] multiThreadedIndexPopulationEnabledValues() { return new Object[]{true, false}; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java index 7eca1983b86e6..c49ad3d32dd6c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java @@ -180,7 +180,7 @@ public void shouldBringIndexOnlineAndFlipOverToIndexAccessor() throws Exception waitForIndexesToComeOnline( indexingService, 0 ); verify( populator, timeout( 1000 ) ).close( true ); - try (IndexUpdater updater = proxy.newUpdater( IndexUpdateMode.ONLINE ) ) + try ( IndexUpdater updater = proxy.newUpdater( IndexUpdateMode.ONLINE ) ) { updater.process( add( 10, "foo" ) ); } @@ -234,7 +234,7 @@ public void shouldDeliverUpdatesThatOccurDuringPopulationToPopulator() throws Ex assertEquals( InternalIndexState.POPULATING, proxy.getState() ); IndexEntryUpdate value2 = add( 2, "value2" ); - try (IndexUpdater updater = proxy.newUpdater( IndexUpdateMode.ONLINE ) ) + try ( IndexUpdater updater = proxy.newUpdater( IndexUpdateMode.ONLINE ) ) { updater.process( value2 ); } @@ -282,7 +282,7 @@ public void shouldStillReportInternalIndexStateAsPopulatingWhenConstraintIndexIs // don't wait for index to come ONLINE here since we're testing that it doesn't verify( populator, timeout( 2000 ) ).close( true ); - try (IndexUpdater updater = proxy.newUpdater( IndexUpdateMode.ONLINE ) ) + try ( IndexUpdater updater = proxy.newUpdater( IndexUpdateMode.ONLINE ) ) { updater.process( add( 10, "foo" ) ); } @@ -467,7 +467,7 @@ public void shouldSnapshotOnlineIndexes() throws Exception public void shouldNotSnapshotPopulatingIndexes() throws Exception { // GIVEN - CountDownLatch populatorLatch = new CountDownLatch(1); + CountDownLatch populatorLatch = new CountDownLatch( 1 ); IndexAccessor indexAccessor = mock(IndexAccessor.class); int indexId = 1; int indexId2 = 2; @@ -1233,7 +1233,7 @@ public void configure( Collection popula }; } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings( {"unchecked", "rawtypes"} ) private static Visitor visitor( Object v ) { return (Visitor) v; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java index ae23d5e755177..ea3524c142151 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java @@ -435,7 +435,7 @@ private IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopula flippableIndexProxy, failedIndexProxyFactory ); } - private IndexPopulation addPopulator(MultipleIndexPopulator multipleIndexPopulator, long indexId, + private IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, long indexId, IndexDescriptor descriptor, IndexPopulator indexPopulator, FlippableIndexProxy flippableIndexProxy, FailedIndexProxyFactory failedIndexProxyFactory ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java index 7161f8453a606..1ae91f886a7f1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java @@ -197,7 +197,7 @@ private static class NodeUpdateProcessListener implements Listener @Override public void receive( NodeRecord nodeRecord ) { - if (nodeRecord.getId() == 7) + if ( nodeRecord.getId() == 7 ) { indexPopulator.queue( IndexEntryUpdate.change( 8L, index, "a", "b" ) ); } @@ -247,7 +247,7 @@ private class ListenableNodeScanViewNodeStoreScan ext } @Override - public void process( NodeRecord nodeRecord) throws FAILURE + public void process( NodeRecord nodeRecord ) throws FAILURE { processListener.receive( nodeRecord ); super.process( nodeRecord ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProviderFactory.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProviderFactory.java index 2af3315d3f7bf..8761831c7f4cb 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProviderFactory.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProviderFactory.java @@ -27,7 +27,7 @@ import static java.util.Objects.requireNonNull; -@Service.Implementation(KernelExtensionFactory.class) +@Service.Implementation( KernelExtensionFactory.class ) public class InMemoryIndexProviderFactory extends KernelExtensionFactory { public static final String KEY = "in-memory-index"; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java index 3b6e692aaf6d5..3a47137cade9c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java @@ -107,7 +107,7 @@ public void shouldNotEmptyQueueConcurrently() final DoubleLatch testLatch = new DoubleLatch(); final ThreadLocal hasRun = ThreadLocal.withInitial( () -> false ); - IndexSamplingJobFactory jobFactory = (indexId, proxy) -> + IndexSamplingJobFactory jobFactory = ( indexId, proxy ) -> { // make sure we execute this once per thread if ( hasRun.get() ) @@ -213,7 +213,7 @@ public void shouldNotStartOtherSamplingWhenSamplingAllTheIndexes() final DoubleLatch jobLatch = new DoubleLatch(); final DoubleLatch testLatch = new DoubleLatch(); - IndexSamplingJobFactory jobFactory = (indexId, proxy) -> + IndexSamplingJobFactory jobFactory = ( indexId, proxy ) -> { if ( ! concurrentCount.compareAndSet( 0, 1 ) ) { @@ -381,9 +381,9 @@ public boolean test( long indexId, IndexDescriptor descriptor ) indexMap.putIndexProxy( indexId, indexProxy ); } - private IndexSamplingController.RecoveryCondition always(boolean ans) + private IndexSamplingController.RecoveryCondition always( boolean ans ) { - return new Always(ans); + return new Always( ans ); } private IndexSamplingController newSamplingController( IndexSamplingController.RecoveryCondition recoveryPredicate ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIT.java index 7f9ca262998ce..8b1f318b79d87 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIT.java @@ -167,7 +167,7 @@ public void shouldNotBeAbleToCommitIfFailedTransactionContext() throws Exception } // THEN - try (Transaction tx = db.beginTx()) + try ( Transaction tx = db.beginTx() ) { Statement statement = statementContextSupplier.get(); try diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java index 7daf8d0b7a563..5e5db0e33038b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java @@ -47,7 +47,7 @@ public abstract class KernelIntegrationTest { - @SuppressWarnings("deprecation") + @SuppressWarnings( "deprecation" ) protected GraphDatabaseAPI db; ThreadToStatementContextBridge statementContextSupplier; protected KernelAPI kernel; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java index 2eb445258c4a6..c06479c9d1fff 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java @@ -150,7 +150,7 @@ public void shouldNotCompositeFindNonMatchingNode() throws Exception assertTrue( "Non-matching created node was found", isNoSuchNode( foundId ) ); } - @Test(timeout = 1000) + @Test( timeout = 1000 ) public void shouldBlockUniqueIndexSeekFromCompetingTransaction() throws Exception { // This is the interleaving that we are trying to verify works correctly: diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/RelationshipIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/RelationshipIT.java index 1baeb26205d7e..489cb908fc255 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/RelationshipIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/RelationshipIT.java @@ -207,8 +207,8 @@ private void assertRelsInSeparateTx( final long refNode, final Direction both, f private void assertRels( PrimitiveLongIterator it, long ... rels ) { - List>> all = new ArrayList<>(rels.length); - for (long element : rels) + List>> all = new ArrayList<>( rels.length ); + for ( long element : rels ) { all.add(hasItem(element)); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/SchemaRecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/SchemaRecoveryIT.java index 23b997008a48c..e3e33601394a1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/SchemaRecoveryIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/SchemaRecoveryIT.java @@ -102,7 +102,7 @@ protected void startup( File storeDir ) throws Throwable @Override public void waitForSchemaTransactionCommitted() throws InterruptedException { - while (!started) + while ( !started ) { Thread.sleep( 10 ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StubCursors.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StubCursors.java index 2d494840a7815..e7248e0b9cbdb 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StubCursors.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StubCursors.java @@ -44,7 +44,7 @@ public class StubCursors public static Cursor asNodeCursor( long... nodeIds ) { NodeItem[] nodeItems = new NodeItem[nodeIds.length]; - for (int i = 0; i < nodeIds.length; i++) + for ( int i = 0; i < nodeIds.length; i++ ) { nodeItems[i] = new StubNodeItem( nodeIds[i], -1, emptySet() ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeLoadingIteratorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeLoadingIteratorTest.java index 4ce8b9db7fc7c..36251c2fe6592 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeLoadingIteratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeLoadingIteratorTest.java @@ -67,7 +67,7 @@ public void shouldHandleANonEmptyIterator() throws Exception NodeLoadingIterator iterator = new NodeLoadingIterator( inner, createMapping( map ) ); // when - then - for ( long i = 1; i <= 3; i++) + for ( long i = 1; i <= 3; i++ ) { assertTrue( iterator.hasNext() ); assertEquals( map.get( i ), iterator.next() ); @@ -88,7 +88,7 @@ public void shouldHandleANonEmptyIteratorWithNotFoundEntities() throws Exception NodeLoadingIterator iterator = new NodeLoadingIterator( inner, createMapping( map ) ); // when - then - for ( long i = 1; i <= 2; i++) + for ( long i = 1; i <= 2; i++ ) { assertTrue( iterator.hasNext() ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreIteratorRelationshipCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreIteratorRelationshipCursorTest.java index 2a94b09971b86..a7d345e28b785 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreIteratorRelationshipCursorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreIteratorRelationshipCursorTest.java @@ -106,7 +106,7 @@ private RelationshipStore getRelationshipStore( RelationshipRecord relationshipR return relationshipStore; } - private static RecordCursors newRecordCursorsWithMockedNeoStores(RelationshipStore relationshipStore) + private static RecordCursors newRecordCursorsWithMockedNeoStores( RelationshipStore relationshipStore ) { NeoStores neoStores = mock( NeoStores.class ); NodeStore nodeStore = newStoreMockWithRecordCursor( NodeStore.class ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/BigStoreIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/BigStoreIT.java index e27aee14af098..d28cb9b9a0e02 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/BigStoreIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/BigStoreIT.java @@ -187,7 +187,7 @@ private Node createReferenceNode( GraphDatabaseService db ) } } - public static boolean machineIsOkToRunThisTest(int requiredHeapMb ) + public static boolean machineIsOkToRunThisTest( int requiredHeapMb ) { if ( SystemUtils.IS_OS_WINDOWS ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeProxySingleRelationshipTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeProxySingleRelationshipTest.java index a96d07ab31b04..bbba7c53ad0ad 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeProxySingleRelationshipTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeProxySingleRelationshipTest.java @@ -20,8 +20,6 @@ package org.neo4j.kernel.impl.core; import org.junit.Test; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.GraphDatabaseService; @@ -101,7 +99,7 @@ public void shouldThrowExceptionIfMultipleDifferentEntriesWithTwoOfThemBeingIden } } - private NodeProxy mockNodeWithRels( final long ... relIds) throws EntityNotFoundException + private NodeProxy mockNodeWithRels( final long... relIds ) throws EntityNotFoundException { NodeProxy.NodeActions nodeActions = mock( NodeProxy.NodeActions.class ); final RelationshipProxy.RelationshipActions relActions = mock( RelationshipProxy.RelationshipActions.class ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestConcurrentRelationshipChainLoadingIssue.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestConcurrentRelationshipChainLoadingIssue.java index 3df61a2b16ac4..6fed7dc08cc41 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestConcurrentRelationshipChainLoadingIssue.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestConcurrentRelationshipChainLoadingIssue.java @@ -79,13 +79,12 @@ private void tryToTriggerRelationshipLoadingStoppingMidWay( int denseNodeThresho private void checkStateToHelpDiagnoseFlakeyTest( GraphDatabaseAPI db, Node node ) { loadNode( db, node ); - // TODO clear cache here loadNode( db, node ); } private void loadNode( GraphDatabaseAPI db, Node node ) { - try (Transaction ignored = db.beginTx()) + try ( Transaction ignored = db.beginTx() ) { Iterables.count( node.getRelationships() ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIsolationBasic.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIsolationBasic.java index 188c5c48ce5e5..586d3bb1b8dc6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIsolationBasic.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIsolationBasic.java @@ -60,7 +60,7 @@ public void testSimpleTransactionIsolation() throws Exception final Node node2 = n2; final Relationship rel1 = r1; - try (Transaction tx = getGraphDb().beginTx()) + try ( Transaction tx = getGraphDb().beginTx() ) { node1.setProperty( "key", "old" ); rel1.setProperty( "key", "old" ); @@ -141,7 +141,7 @@ public void run() throw t1Exception.get(); } - try (Transaction tx = getGraphDb().beginTx()) + try ( Transaction tx = getGraphDb().beginTx() ) { for ( Relationship rel : node1.getRelationships() ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestNeo4j.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestNeo4j.java index 3ea0a359b34e0..ae5abbe6ec7de 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestNeo4j.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestNeo4j.java @@ -32,6 +32,7 @@ import org.neo4j.kernel.impl.AbstractNeo4jTestCase; import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.kernel.impl.store.id.IdType; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -144,13 +145,13 @@ public void testNodeChangePropertyArray() throws Exception tx.success(); } - try (Transaction ignored = getGraphDb().beginTx() ) + try ( Transaction ignored = getGraphDb().beginTx() ) { node.setProperty( "test", new String[] { "value1", "value2" } ); // no success, we wanna test rollback on this operation } - try (Transaction tx = getGraphDb().beginTx() ) + try ( Transaction tx = getGraphDb().beginTx() ) { String[] value = (String[]) node.getProperty( "test" ); assertEquals( 1, value.length ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestReadOnlyNeo4j.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestReadOnlyNeo4j.java index 81630ef9d4c46..8c36502addb49 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestReadOnlyNeo4j.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestReadOnlyNeo4j.java @@ -63,7 +63,7 @@ public void testSimple() .newGraphDatabase(); assertEquals( someData, DbRepresentation.of( readGraphDb ) ); - try (Transaction tx = readGraphDb.beginTx()) + try ( Transaction tx = readGraphDb.beginTx() ) { readGraphDb.createNode(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationship.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationship.java index ccb62bd4253ce..2616a54eb791f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationship.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationship.java @@ -1002,7 +1002,7 @@ public void deletionOfSameRelationshipTwiceInOneTransactionShouldNotRollbackIt() } } - @Test(expected = NotFoundException.class) + @Test( expected = NotFoundException.class ) public void deletionOfAlreadyDeletedRelationshipShouldThrow() { // Given diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationshipCount.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationshipCount.java index 99ba291084d27..cdf32c7aad368 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationshipCount.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationshipCount.java @@ -55,7 +55,7 @@ @RunWith( Parameterized.class ) public class TestRelationshipCount { - @Parameterized.Parameters(name = "denseNodeThreshold={0}") + @Parameterized.Parameters( name = "denseNodeThreshold={0}" ) public static Collection data() { Collection data = new ArrayList<>(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestTransactionEvents.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestTransactionEvents.java index 12b72f2dd509f..f09c4e2eb4f60 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestTransactionEvents.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestTransactionEvents.java @@ -1216,11 +1216,7 @@ public void remove( Node node, String label ) private void put( Map> changes, Node node, String label ) { - Set labels = changes.get(node); - if (labels == null) - { - changes.put( node, labels = new HashSet<>() ); - } + Set labels = changes.computeIfAbsent( node, k -> new HashSet<>() ); labels.add( label ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TransactionEventsIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TransactionEventsIT.java index 75d6be761ab04..6c250a76f1654 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TransactionEventsIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TransactionEventsIT.java @@ -185,7 +185,7 @@ public void shouldGetSpecifiedUsernameAndMetaDataInTXData() assertThat( "Should have metadata with specified username", metaDataRef.get(), equalTo( metadata ) ); } - private TransactionEventHandler.Adapter getBeforeCommitHandler(Consumer dataConsumer) + private TransactionEventHandler.Adapter getBeforeCommitHandler( Consumer dataConsumer ) { return new TransactionEventHandler.Adapter() { @@ -203,7 +203,7 @@ private void runTransaction() runTransaction( AnonymousContext.write(), Collections.emptyMap() ); } - private void runTransaction( SecurityContext securityContext, Map metaData) + private void runTransaction( SecurityContext securityContext, Map metaData ) { try ( Transaction transaction = db.beginTransaction( KernelTransaction.Type.explicit, securityContext ) ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStoreChaosIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStoreChaosIT.java index bf6c341ee6f82..746da5ba695a8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStoreChaosIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStoreChaosIT.java @@ -33,13 +33,13 @@ public class NativeLabelScanStoreChaosIT extends LabelScanStoreChaosIT @Override protected RestartAction corruptTheLabelScanStoreIndex() { - return (fs, directory) -> scrambleFile( storeFile( directory ) ); + return ( fs, directory ) -> scrambleFile( storeFile( directory ) ); } @Override protected RestartAction deleteTheLabelScanStoreIndex() { - return (fs, directory) -> fs.deleteFile( storeFile( directory ) ); + return ( fs, directory ) -> fs.deleteFile( storeFile( directory ) ); } private static File storeFile( File directory ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/AcquireAndReleaseLocksCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/AcquireAndReleaseLocksCompatibility.java index 96a490e60c033..d5a1010edead5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/AcquireAndReleaseLocksCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/AcquireAndReleaseLocksCompatibility.java @@ -32,7 +32,7 @@ /** * Tests simple acquiring and releasing of single locks. * For testing "stacking" locks on the same client, see {@link LockReentrancyCompatibility}. */ -@Ignore("Not a test. This is a compatibility suite, run from LockingCompatibilityTestSuite.") +@Ignore( "Not a test. This is a compatibility suite, run from LockingCompatibilityTestSuite." ) public class AcquireAndReleaseLocksCompatibility extends LockingCompatibilityTestSuite.Compatibility { public AcquireAndReleaseLocksCompatibility( LockingCompatibilityTestSuite suite ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/DeadlockCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/DeadlockCompatibility.java index 32d54802c5f79..f2a892b700410 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/DeadlockCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/DeadlockCompatibility.java @@ -36,7 +36,7 @@ import static org.neo4j.kernel.impl.locking.Locks.Client; import static org.neo4j.kernel.impl.locking.ResourceTypes.NODE; -@Ignore("Not a test. This is a compatibility suite, run from LockingCompatibilityTestSuite.") +@Ignore( "Not a test. This is a compatibility suite, run from LockingCompatibilityTestSuite." ) public class DeadlockCompatibility extends LockingCompatibilityTestSuite.Compatibility { public DeadlockCompatibility( LockingCompatibilityTestSuite suite ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockReentrancyCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockReentrancyCompatibility.java index 202d4752408ef..827225f8c36d8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockReentrancyCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockReentrancyCompatibility.java @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; import static org.neo4j.kernel.impl.locking.ResourceTypes.NODE; -@Ignore("Not a test. This is a compatibility suite, run from LockingCompatibilityTestSuite.") +@Ignore( "Not a test. This is a compatibility suite, run from LockingCompatibilityTestSuite." ) public class LockReentrancyCompatibility extends LockingCompatibilityTestSuite.Compatibility { public LockReentrancyCompatibility( LockingCompatibilityTestSuite suite ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockingCompatibilityTestSuite.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockingCompatibilityTestSuite.java index 48309398e1488..b540bc94d9f76 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockingCompatibilityTestSuite.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockingCompatibilityTestSuite.java @@ -50,9 +50,8 @@ import static org.neo4j.test.rule.concurrent.OtherThreadRule.isWaiting; /** Base for locking tests. */ -@RunWith(ParameterizedSuiteRunner.class) -@Suite.SuiteClasses({ - AcquireAndReleaseLocksCompatibility.class, +@RunWith( ParameterizedSuiteRunner.class ) +@Suite.SuiteClasses( {AcquireAndReleaseLocksCompatibility.class, DeadlockCompatibility.class, LockReentrancyCompatibility.class, RWLockCompatibility.class, @@ -61,10 +60,10 @@ AcquisitionTimeoutCompatibility.class, TracerCompatibility.class, ActiveLocksListingCompatibility.class, -}) +} ) public abstract class LockingCompatibilityTestSuite { - protected abstract Locks createLockManager(Config config, Clock clock); + protected abstract Locks createLockManager( Config config, Clock clock ); /** * Implementing this requires intricate knowledge of implementation of the particular locks client. @@ -137,7 +136,7 @@ public abstract class LockCommand implements WorkerCommand private final OtherThreadRule thread; private final Locks.Client client; - protected LockCommand(OtherThreadRule thread, Locks.Client client) + protected LockCommand( OtherThreadRule thread, Locks.Client client ) { this.thread = thread; this.client = client; @@ -184,7 +183,7 @@ protected LockCommand acquireExclusive( final ResourceType resourceType, final long key ) { - return new LockCommand(clientToThreadMap.get( client ), client) + return new LockCommand( clientToThreadMap.get( client ), client ) { @Override public void doWork( Locks.Client client ) throws AcquireLockTimeoutException @@ -200,7 +199,7 @@ protected LockCommand acquireShared( final ResourceType resourceType, final long key ) { - return new LockCommand(clientToThreadMap.get( client ), client) + return new LockCommand( clientToThreadMap.get( client ), client ) { @Override public void doWork( Locks.Client client ) throws AcquireLockTimeoutException @@ -215,7 +214,7 @@ protected LockCommand release( final ResourceType resourceType, final long key ) { - return new LockCommand(clientToThreadMap.get( client ), client) + return new LockCommand( clientToThreadMap.get( client ), client ) { @Override public void doWork( Locks.Client client ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/RWLockCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/RWLockCompatibility.java index 8b4aae589df2d..33ad5b7f9f660 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/RWLockCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/RWLockCompatibility.java @@ -39,7 +39,7 @@ * This is the test suite that tested the original (from 2007) lock manager. It has been ported to test {@link org.neo4j.kernel.impl.locking.Locks} * to ensure implementors of that API don't fall in any of the traps this test suite sets for them. */ -@Ignore("Not a test. This is a compatibility suite, run from LockingCompatibilityTestSuite.") +@Ignore( "Not a test. This is a compatibility suite, run from LockingCompatibilityTestSuite." ) public class RWLockCompatibility extends LockingCompatibilityTestSuite.Compatibility { public RWLockCompatibility( LockingCompatibilityTestSuite suite ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/community/CommunityLocksTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/community/CommunityLocksTest.java index be85627aed0a2..03e35fc5a4ae1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/community/CommunityLocksTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/community/CommunityLocksTest.java @@ -29,7 +29,7 @@ public class CommunityLocksTest extends LockingCompatibilityTestSuite { @Override - protected Locks createLockManager(Config config, Clock clock) + protected Locks createLockManager( Config config, Clock clock ) { return new CommunityLockManger( config, clock ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/FieldInjectionsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/FieldInjectionsTest.java index aba59527a302a..da424ec661314 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/FieldInjectionsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/FieldInjectionsTest.java @@ -84,7 +84,7 @@ public void inheritanceIsAllowed() throws Throwable { // Given ComponentRegistry components = new ComponentRegistry(); - components.register( int.class, (ctx) -> 1337 ); + components.register( int.class, ( ctx ) -> 1337 ); FieldInjections injections = new FieldInjections( components ); // When @@ -106,7 +106,7 @@ public void syntheticsAllowed() throws Throwable { // Given ComponentRegistry components = new ComponentRegistry(); - components.register( int.class, (ctx) -> 1337 ); + components.register( int.class, ( ctx ) -> 1337 ); FieldInjections injections = new FieldInjections( components ); // When diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/MethodSignatureCompilerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/MethodSignatureCompilerTest.java index 9863f190fc637..93b5a0f380a6a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/MethodSignatureCompilerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/MethodSignatureCompilerTest.java @@ -59,19 +59,19 @@ public static class UnmappableRecord public static class ClassWithProcedureWithSimpleArgs { @Procedure - public Stream echo( @Name("name") String in) + public Stream echo( @Name( "name" ) String in ) { return Stream.of( new MyOutputRecord( in )); } @Procedure - public Stream echoWithoutAnnotations( @Name("name")String in1, String in2) + public Stream echoWithoutAnnotations( @Name( "name" ) String in1, String in2 ) { return Stream.of( new MyOutputRecord( in1 + in2 )); } @Procedure - public Stream echoWithInvalidType( @Name("name") UnmappableRecord in) + public Stream echoWithInvalidType( @Name( "name" ) UnmappableRecord in ) { return Stream.of( new MyOutputRecord( "echo" )); } @@ -115,7 +115,7 @@ public void shouldGiveHelpfulErrorOnUnmappable() throws Throwable "For your reference, known types are:" )); // When - new MethodSignatureCompiler(new TypeMappers()).signatureFor( echo ); + new MethodSignatureCompiler( new TypeMappers() ).signatureFor( echo ); } @Test @@ -131,6 +131,6 @@ public void shouldGiveHelpfulErrorOnMissingAnnotations() throws Throwable "Please add the annotation, recompile the class and try again." )); // When - new MethodSignatureCompiler(new TypeMappers()).signatureFor( echo ); + new MethodSignatureCompiler( new TypeMappers() ).signatureFor( echo ); } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ProcedureJarLoaderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ProcedureJarLoaderTest.java index 25b0edc13f3a1..6763f5876ece1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ProcedureJarLoaderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ProcedureJarLoaderTest.java @@ -51,9 +51,9 @@ import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; -import static org.neo4j.graphdb.factory.GraphDatabaseSettings.procedure_unrestricted; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import static org.neo4j.graphdb.factory.GraphDatabaseSettings.procedure_unrestricted; import static org.neo4j.helpers.collection.Iterators.asList; import static org.neo4j.helpers.collection.MapUtil.genericMap; import static org.neo4j.kernel.api.proc.Neo4jTypes.NTInteger; @@ -71,7 +71,7 @@ public class ProcedureJarLoaderTest private Log log = mock( Log.class ); private final ProcedureJarLoader jarloader = new ProcedureJarLoader( new ReflectiveProcedureCompiler( new TypeMappers(), new ComponentRegistry(), - registryWithUnsafeAPI(), log, procedureConfig() ), NullLog.getInstance()); + registryWithUnsafeAPI(), log, procedureConfig() ), NullLog.getInstance() ); @Test public void shouldLoadProcedureFromJar() throws Throwable @@ -317,9 +317,9 @@ public Stream myOtherProcedure() public static class ClassWithProcedureWithArgument { @Procedure - public Stream myProcedure(@Name( "value" ) long value) + public Stream myProcedure( @Name( "value" ) long value ) { - return Stream.of( new Output(value) ); + return Stream.of( new Output( value ) ); } } @@ -397,7 +397,7 @@ public long getNumber() private ComponentRegistry registryWithUnsafeAPI() { ComponentRegistry allComponents = new ComponentRegistry(); - allComponents.register( UnsafeAPI.class, (ctx) -> new UnsafeAPI() ); + allComponents.register( UnsafeAPI.class, ( ctx ) -> new UnsafeAPI() ); return allComponents; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ProceduresTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ProceduresTest.java index d4989598d298a..3f5180e9c3287 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ProceduresTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ProceduresTest.java @@ -168,7 +168,7 @@ public void shouldMakeContextAvailable() throws Throwable // Given Key someKey = key("someKey", String.class); - procs.register( new CallableProcedure.BasicProcedure(signature) + procs.register( new CallableProcedure.BasicProcedure( signature ) { @Override public RawIterator apply( Context ctx, Object[] input ) throws ProcedureException @@ -257,7 +257,7 @@ public void shouldNotCompile() private CallableProcedure.BasicProcedure procedureWithSignature( final ProcedureSignature signature ) { - return new CallableProcedure.BasicProcedure(signature) + return new CallableProcedure.BasicProcedure( signature ) { @Override public RawIterator apply( Context ctx, Object[] input ) throws ProcedureException diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveProcedureTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveProcedureTest.java index ac5a879e293e7..bb64f0c2fe518 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveProcedureTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveProcedureTest.java @@ -81,7 +81,7 @@ public void shouldInjectLogging() throws KernelException { // Given Log log = spy( Log.class ); - components.register( Log.class, (ctx) -> log ); + components.register( Log.class, ( ctx ) -> log ); CallableProcedure procedure = procedureCompiler.compileProcedure( LoggingProcedure.class, Optional.empty(), true ).get( 0 ); @@ -487,9 +487,7 @@ public WierdConstructorProcedure( WierdConstructorProcedure wat ) @Procedure public Stream listCoolPeople() { - return Stream.of( - new MyOutputRecord( "Bonnie" ), - new MyOutputRecord( "Clyde" ) ); + return Stream.of( new MyOutputRecord( "Bonnie" ), new MyOutputRecord( "Clyde" ) ); } } @@ -545,9 +543,7 @@ private PrivateConstructorProcedure() @Procedure public Stream listCoolPeople() { - return Stream.of( - new MyOutputRecord( "Bonnie" ), - new MyOutputRecord( "Clyde" ) ); + return Stream.of( new MyOutputRecord( "Bonnie" ), new MyOutputRecord( "Clyde" ) ); } } @@ -566,13 +562,13 @@ public Stream thisIsNotAProcedure() public static class ProcedureWithOverriddenName { - @Procedure("org.mystuff.thisisActuallyTheName") + @Procedure( "org.mystuff.thisisActuallyTheName" ) public void somethingThatShouldntMatter() { } - @Procedure("singleName") + @Procedure( "singleName" ) public void blahDoesntMatterEither() { @@ -581,7 +577,7 @@ public void blahDoesntMatterEither() public static class ProcedureWithSingleName { - @Procedure("singleName") + @Procedure( "singleName" ) public void blahDoesntMatterEither() { @@ -590,18 +586,18 @@ public void blahDoesntMatterEither() public static class ProcedureWithDeprecation { - @Procedure("newProc") + @Procedure( "newProc" ) public void newProc() { } @Deprecated - @Procedure(value = "oldProc", deprecatedBy = "newProc") + @Procedure( value = "oldProc", deprecatedBy = "newProc" ) public void oldProc() { } - @Procedure(value = "badProc", deprecatedBy = "newProc") + @Procedure( value = "badProc", deprecatedBy = "newProc" ) public void badProc() { } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveProcedureWithArgumentsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveProcedureWithArgumentsTest.java index 1ac2aad944c9c..ee18088d5f540 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveProcedureWithArgumentsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveProcedureWithArgumentsTest.java @@ -188,8 +188,8 @@ public Stream listCoolPeople( String name, int age ) public static class ClassWithProcedureWithDefaults { @Procedure - public Stream defaultValues( @Name( value = "a", defaultValue = "a") String a , @Name( value = "b", defaultValue = "42") long b, @Name( value = "c", - defaultValue = "3.14") double c) + public Stream defaultValues( @Name( value = "a", defaultValue = "a" ) String a, + @Name( value = "b", defaultValue = "42" ) long b, @Name( value = "c", defaultValue = "3.14" ) double c ) { return Stream.empty(); } @@ -198,7 +198,8 @@ public Stream defaultValues( @Name( value = "a", defaultValue = public static class ClassWithProcedureWithMisplacedDefault { @Procedure - public Stream defaultValues( @Name( "a" ) String a , @Name( value = "b", defaultValue = "42") long b, @Name( "c" ) Object c) + public Stream defaultValues( @Name( "a" ) String a, + @Name( value = "b", defaultValue = "42" ) long b, @Name( "c" ) Object c ) { return Stream.empty(); } @@ -207,7 +208,7 @@ public Stream defaultValues( @Name( "a" ) String a , @Name( valu public static class ClassWithProcedureWithBadlyTypedDefault { @Procedure - public Stream defaultValues( @Name( value = "a", defaultValue = "forty-two") long b) + public Stream defaultValues( @Name( value = "a", defaultValue = "forty-two" ) long b ) { return Stream.empty(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveUserAggregationFunctionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveUserAggregationFunctionTest.java index 3029fb8338797..ca4e16e101e0c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveUserAggregationFunctionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveUserAggregationFunctionTest.java @@ -759,7 +759,7 @@ public String thisIsNotAFunction() public static class FunctionWithOverriddenName { - @UserAggregationFunction("org.mystuff.thisisActuallyTheName") + @UserAggregationFunction( "org.mystuff.thisisActuallyTheName" ) public CoolPeopleAggregator collectCool() { return new CoolPeopleAggregator(); @@ -768,7 +768,7 @@ public CoolPeopleAggregator collectCool() public static class FunctionWithSingleName { - @UserAggregationFunction("singleName") + @UserAggregationFunction( "singleName" ) public CoolPeopleAggregator collectCool() { return new CoolPeopleAggregator(); @@ -784,13 +784,13 @@ public CoolPeopleAggregator newFunc() } @Deprecated - @UserAggregationFunction(deprecatedBy = "newFunc") + @UserAggregationFunction( deprecatedBy = "newFunc" ) public CoolPeopleAggregator oldFunc() { return new CoolPeopleAggregator(); } - @UserAggregationFunction(deprecatedBy = "newFunc") + @UserAggregationFunction( deprecatedBy = "newFunc" ) public CoolPeopleAggregator badFunc() { return new CoolPeopleAggregator(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveUserFunctionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveUserFunctionTest.java index c828d47db70b8..ead96e2617dd5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveUserFunctionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ReflectiveUserFunctionTest.java @@ -77,7 +77,7 @@ public void shouldInjectLogging() throws KernelException { // Given Log log = spy( Log.class ); - components.register( Log.class, (ctx) -> log ); + components.register( Log.class, ( ctx ) -> log ); CallableUserFunction function = procedureCompiler.compileFunction( LoggingFunction.class ).get( 0 ); // When @@ -448,7 +448,7 @@ public String thisIsNotAFunction() public static class FunctionWithOverriddenName { - @UserFunction("org.mystuff.thisisActuallyTheName") + @UserFunction( "org.mystuff.thisisActuallyTheName" ) public Object somethingThatShouldntMatter() { return null; @@ -458,7 +458,7 @@ public Object somethingThatShouldntMatter() public static class FunctionWithSingleName { - @UserFunction("singleName") + @UserFunction( "singleName" ) public String blahDoesntMatterEither() { return null; @@ -474,13 +474,13 @@ public Object newFunc() } @Deprecated - @UserFunction(deprecatedBy = "newFunc") + @UserFunction( deprecatedBy = "newFunc" ) public String oldFunc() { return null; } - @UserFunction(deprecatedBy = "newFunc") + @UserFunction( deprecatedBy = "newFunc" ) public Object badFunc() { return null; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ResourceInjectionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ResourceInjectionTest.java index f13a5a1bf1f98..a412574d1cdc6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ResourceInjectionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ResourceInjectionTest.java @@ -334,13 +334,14 @@ public static class AggregationFunctionWithInjectedAPI @UserAggregationFunction public VoidOutput listCoolPeople() { - return new VoidOutput(api); + return new VoidOutput( api ); } public static class VoidOutput { private MyAwesomeAPI api; - public VoidOutput(MyAwesomeAPI api) + + public VoidOutput( MyAwesomeAPI api ) { this.api = api; } @@ -390,13 +391,14 @@ public static class AggregationFunctionWithUnknownAPI @UserAggregationFunction public VoidOutput listCoolPeople() { - return new VoidOutput(api); + return new VoidOutput( api ); } public static class VoidOutput { private UnknownAPI api; - public VoidOutput(UnknownAPI api) + + public VoidOutput( UnknownAPI api ) { this.api = api; } @@ -445,14 +447,14 @@ public static class AggregationFunctionWithUnsafeAPI @UserAggregationFunction public VoidOutput listCoolPeople() { - return new VoidOutput(api); + return new VoidOutput( api ); } public static class VoidOutput { private MyUnsafeAPI api; - public VoidOutput(MyUnsafeAPI api) + public VoidOutput( MyUnsafeAPI api ) { this.api = api; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CommonAbstractStoreBehaviourTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CommonAbstractStoreBehaviourTest.java index d83ddf9ca7010..322ad1d2b5636 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CommonAbstractStoreBehaviourTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CommonAbstractStoreBehaviourTest.java @@ -385,7 +385,7 @@ private class MyFormat extends BaseRecordFormat implements StoreHeade { MyFormat() { - super( (x) -> 4, 8, 32 ); + super( ( x ) -> 4, 8, 32 ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorRebuildFailureEmulationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorRebuildFailureEmulationTest.java index aa00a1408df82..3042e8321034b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorRebuildFailureEmulationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorRebuildFailureEmulationTest.java @@ -58,11 +58,11 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -@RunWith(Suite.class) -@SuiteClasses({IdGeneratorRebuildFailureEmulationTest.FailureBeforeRebuild.class}) +@RunWith( Suite.class ) +@SuiteClasses( {IdGeneratorRebuildFailureEmulationTest.FailureBeforeRebuild.class} ) public class IdGeneratorRebuildFailureEmulationTest { - @RunWith(JUnit4.class) + @RunWith( JUnit4.class ) public static final class FailureBeforeRebuild extends IdGeneratorRebuildFailureEmulationTest { @Override @@ -210,8 +210,6 @@ private static class FileSystem extends EphemeralFileSystemAbstraction { void disposeAndAssertNoOpenFiles() throws Exception { - //Collection open = openFiles(); - //assertTrue( "Open files: " + open, open.isEmpty() ); assertNoOpenFiles(); super.close(); } @@ -222,7 +220,7 @@ public void close() } } - @SuppressWarnings("deprecation") + @SuppressWarnings( "deprecation" ) private class Database extends ImpermanentGraphDatabase { Database( File storeDir ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java index ad334970de30c..14ec660608abc 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java @@ -172,7 +172,7 @@ public void notAllowCreateDynamicStoreWithNegativeBlockSize() exception.expect( IllegalArgumentException.class ); exception.expectMessage( "Block size of dynamic array store should be positive integer." ); - try (NeoStores neoStores = sf.openNeoStores( true )) + try ( NeoStores neoStores = sf.openNeoStores( true ) ) { neoStores.createDynamicArrayStore( "someStore", IdType.ARRAY_BLOCK, -2 ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyKeyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyKeyTest.java index c0f478750ca9f..be62f7ea8020b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyKeyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyKeyTest.java @@ -57,7 +57,7 @@ public void lazyLoadWithinWriteTransaction() throws Exception GraphDatabaseService db = new TestGraphDatabaseFactory().setFileSystem( fileSystem ).newImpermanentDatabase( dir ); // When - try (Transaction tx = db.beginTx()) + try ( Transaction tx = db.beginTx() ) { db.createNode(); Node node = db.getNodeById( nodeId ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java index 2ff9d2ada17dc..5cd1657af5ca8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java @@ -235,7 +235,7 @@ public void graphPropertiesAreLockedPerTx() throws Exception @Test public void twoUncleanInARow() throws Exception { - File storeDir = new File("dir"); + File storeDir = new File( "dir" ); try ( EphemeralFileSystemAbstraction snapshot = produceUncleanStore( fs.get(), storeDir ) ) { try ( EphemeralFileSystemAbstraction snapshot2 = produceUncleanStore( snapshot, storeDir ) ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestStringCharset.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestStringCharset.java index b2afa0a245413..e3761ec01b9d0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestStringCharset.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestStringCharset.java @@ -59,7 +59,9 @@ String randomString( int maxLen ) { chars[i] = (char) (0x20 + random.nextInt( 0xC0 )); if ( chars[i] > 0x7f ) - { chars[i] += 0x20; } + { + chars[i] += 0x20; + } } return new String( chars ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/countStore/InMemoryCountsStoreCountsSnapshotSerializerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/countStore/InMemoryCountsStoreCountsSnapshotSerializerTest.java index 27a8c0244ac20..4f86409105262 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/countStore/InMemoryCountsStoreCountsSnapshotSerializerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/countStore/InMemoryCountsStoreCountsSnapshotSerializerTest.java @@ -235,7 +235,7 @@ public static IndexSampleKey indexSampleKey( long indexId ) return CountsKeyFactory.indexSampleKey( indexId ); } - public static IndexStatisticsKey indexStatisticsKey( long indexId) + public static IndexStatisticsKey indexStatisticsKey( long indexId ) { return CountsKeyFactory.indexStatisticsKey( indexId ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java index ed33e74136db2..b4d7776e4931c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java @@ -279,7 +279,7 @@ public void setup() { fs = fsRule.get(); dir = testDir.directory( "dir" ).getAbsoluteFile(); - dbBuilder = new TestGraphDatabaseFactory().setFileSystem( new UncloseableDelegatingFileSystemAbstraction(fs) ) + dbBuilder = new TestGraphDatabaseFactory().setFileSystem( new UncloseableDelegatingFileSystemAbstraction( fs ) ) .newImpermanentDatabaseBuilder( dir ); pageCache = pcRule.getPageCache( fs ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java index dd76c554a3681..4482c8fa97c42 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java @@ -426,13 +426,13 @@ public void visitRelationshipCount( int startLabelId, int typeId, int endLabelId } @Override - public void visitIndexStatistics( long indexId, long updates, long size) + public void visitIndexStatistics( long indexId, long updates, long size ) { records.add( Pair.of( CountsKeyFactory.indexStatisticsKey( indexId ), size ) ); } @Override - public void visitIndexSample( long indexId, long unique, long size) + public void visitIndexSample( long indexId, long unique, long size ) { records.add( Pair.of( CountsKeyFactory.indexSampleKey( indexId ), size ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsTrackerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsTrackerTest.java index 034edd24dcbf1..293c4fc28f92e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsTrackerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsTrackerTest.java @@ -85,7 +85,7 @@ public void shouldBeAbleToStartAndStopTheStore() throws Exception } @Test - @Resources.Life(STARTED) + @Resources.Life( STARTED ) public void shouldBeAbleToWriteDataToCountsTracker() throws Exception { // given @@ -264,7 +264,7 @@ public void shouldOrderStoreByTxIdInHeaderThenMinorVersion() throws Exception } @Test - @Resources.Life(STARTED) + @Resources.Life( STARTED ) public void shouldNotRotateIfNoDataChanges() throws Exception { // given @@ -279,7 +279,7 @@ public void shouldNotRotateIfNoDataChanges() throws Exception } @Test - @Resources.Life(STARTED) + @Resources.Life( STARTED ) public void shouldRotateOnDataChangesEvenIfTransactionIsUnchanged() throws Exception { // given @@ -298,7 +298,7 @@ public void shouldRotateOnDataChangesEvenIfTransactionIsUnchanged() throws Excep } @Test - @Resources.Life(STARTED) + @Resources.Life( STARTED ) public void shouldSupportTransactionsAppliedOutOfOrderOnRotation() throws Exception { // given @@ -352,7 +352,7 @@ public void shouldSupportTransactionsAppliedOutOfOrderOnRotation() throws Except } @Test - @Resources.Life(STARTED) + @Resources.Life( STARTED ) public void shouldNotEndUpInBrokenStateAfterRotationFailure() throws Exception { // GIVEN diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/LimitedRecordGenerators.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/LimitedRecordGenerators.java index 4109a99358d1e..fa15f0305c8c7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/LimitedRecordGenerators.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/LimitedRecordGenerators.java @@ -70,7 +70,7 @@ public LimitedRecordGenerators( Randoms random, int entityBits, int propertyBits @Override public Generator relationshipTypeToken() { - return (recordSize, format, recordId) -> new RelationshipTypeTokenRecord( toIntExact( recordId ) ).initialize( + return ( recordSize, format, recordId ) -> new RelationshipTypeTokenRecord( toIntExact( recordId ) ).initialize( random.nextBoolean(), randomInt( tokenBits ) ); } @@ -78,7 +78,7 @@ public Generator relationshipTypeToken() @Override public Generator relationshipGroup() { - return (recordSize, format, recordId) -> new RelationshipGroupRecord( recordId ).initialize( + return ( recordSize, format, recordId ) -> new RelationshipGroupRecord( recordId ).initialize( random.nextBoolean(), randomInt( tokenBits ), randomLongOrOccasionallyNull( entityBits ), @@ -91,7 +91,7 @@ public Generator relationshipGroup() @Override public Generator relationship() { - return (recordSize, format, recordId) -> new RelationshipRecord( recordId ).initialize( + return ( recordSize, format, recordId ) -> new RelationshipRecord( recordId ).initialize( random.nextBoolean(), randomLongOrOccasionallyNull( propertyBits ), random.nextLong( entityBits ), random.nextLong( entityBits ), randomInt( tokenBits ), @@ -103,7 +103,7 @@ public Generator relationship() @Override public Generator propertyKeyToken() { - return (recordSize, format, recordId) -> new PropertyKeyTokenRecord( toIntExact( recordId ) ).initialize( + return ( recordSize, format, recordId ) -> new PropertyKeyTokenRecord( toIntExact( recordId ) ).initialize( random.nextBoolean(), random.nextInt( tokenBits ), abs( random.nextInt() ) ); @@ -143,7 +143,7 @@ public Generator property() @Override public Generator node() { - return (recordSize, format, recordId) -> new NodeRecord( recordId ).initialize( + return ( recordSize, format, recordId ) -> new NodeRecord( recordId ).initialize( random.nextBoolean(), randomLongOrOccasionallyNull( propertyBits ), random.nextBoolean(), @@ -154,7 +154,7 @@ public Generator node() @Override public Generator labelToken() { - return (recordSize, format, recordId) -> new LabelTokenRecord( toIntExact( recordId ) ).initialize( + return ( recordSize, format, recordId ) -> new LabelTokenRecord( toIntExact( recordId ) ).initialize( random.nextBoolean(), random.nextInt( tokenBits ) ); } @@ -162,7 +162,7 @@ public Generator labelToken() @Override public Generator dynamic() { - return (recordSize, format, recordId) -> + return ( recordSize, format, recordId ) -> { int dataSize = recordSize - format.getRecordHeaderSize(); int length = random.nextBoolean() ? dataSize : random.nextInt( dataSize ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/RecordFormatPropertyConfiguratorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/RecordFormatPropertyConfiguratorTest.java index 33c243edac4fa..89672eda5aac3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/RecordFormatPropertyConfiguratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/RecordFormatPropertyConfiguratorTest.java @@ -160,7 +160,7 @@ public RecordFormat relationshipTypeToken() @Override public RecordFormat dynamic() { - return new ResizableRecordFormat(dynamicRecordHeaderSize); + return new ResizableRecordFormat( dynamicRecordHeaderSize ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/FreeIdKeeperTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/FreeIdKeeperTest.java index 9d0e2b3764553..aba82da96d09e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/FreeIdKeeperTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/FreeIdKeeperTest.java @@ -328,7 +328,7 @@ public void shouldNotReturnIdsPersistedDuringThisRunIfAggressiveIsFalse() throws public void shouldReturnIdsRestoredAndIgnoreNewlyReleasedIfAggressiveReuseIsFalse() throws Exception { // given - StoreChannel channel = fs.get().open( new File("id.file" ), "rw" ); + StoreChannel channel = fs.get().open( new File( "id.file" ), "rw" ); int threshold = 10; FreeIdKeeper keeper = new FreeIdKeeper( channel, threshold, false ); @@ -368,7 +368,7 @@ public void shouldReturnNoResultIfIdsAreRestoredAndExhaustedAndThereAreFreeIdsFr throws Exception { // given - StoreChannel channel = fs.get().open( new File("id.file" ), "rw" ); + StoreChannel channel = fs.get().open( new File( "id.file" ), "rw" ); int threshold = 10; FreeIdKeeper keeper = new FreeIdKeeper( channel, threshold, false ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueWriterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueWriterTest.java index 16559b04c6971..b9dabb8875e44 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueWriterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueWriterTest.java @@ -34,7 +34,7 @@ public class KeyValueWriterTest { private static final int ENTRIES_PER_PAGE = 4 * 1024 / 16; - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private StubCollector collector = new StubCollector( ENTRIES_PER_PAGE ); private final StubWriter stub = new StubWriter(); private KeyValueWriter writer = new KeyValueWriter( collector, stub ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/RotationTimerFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/RotationTimerFactoryTest.java index 0db36b1428beb..394f52b7e6e9e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/RotationTimerFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/RotationTimerFactoryTest.java @@ -39,7 +39,7 @@ public void testTimer() throws Exception Clock fixedClock = Clock.fixed( Instant.ofEpochMilli( 10000 ), ZoneOffset.UTC ); // WHEN - RotationTimerFactory timerFactory = new RotationTimerFactory( fixedClock, 1000); + RotationTimerFactory timerFactory = new RotationTimerFactory( fixedClock, 1000 ); RotationTimerFactory.RotationTimer timer = timerFactory.createTimer(); RotationTimerFactory.RotationTimer anotherTimer = timerFactory.createTimer(); @@ -50,7 +50,7 @@ public void testTimer() throws Exception // WHEN FakeClock fakeClock = Clocks.fakeClock(); - RotationTimerFactory fakeTimerFactory = new RotationTimerFactory( fakeClock, 1000); + RotationTimerFactory fakeTimerFactory = new RotationTimerFactory( fakeClock, 1000 ); RotationTimerFactory.RotationTimer fakeTimer = fakeTimerFactory.createTimer(); fakeClock.forward( 1001, TimeUnit.MILLISECONDS ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/StubCollector.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/StubCollector.java index 8f85453ca7a6e..f748e9f63df68 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/StubCollector.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/StubCollector.java @@ -34,7 +34,7 @@ boolean verifyFormatSpecifier( ReadableBuffer value ) static HeaderField[] headerFields( String[] keys ) { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) HeaderField[] fields = new HeaderField[keys.length]; for ( int i = 0; i < keys.length; i++ ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LegacyLogsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LegacyLogsTest.java index cae24ca7f9d5f..36329b2dc4fd8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LegacyLogsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LegacyLogsTest.java @@ -222,7 +222,7 @@ public void transactionInformationRetrievedFromCommitEntries() throws IOExceptio assertEquals( newTransactionId( 3 ), getTransactionInformation( legacyLogs, 3 ) ); } - @Test(expected = IOException.class) + @Test( expected = IOException.class ) @SuppressWarnings( "unchecked" ) public void ioExceptionsPropagatedWhenFailToReadLegacyLog() throws IOException { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LogEntrySortingCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LogEntrySortingCursorTest.java index f754831b1e0ba..594023435262c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LogEntrySortingCursorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LogEntrySortingCursorTest.java @@ -48,7 +48,7 @@ public class LogEntrySortingCursorTest { private static final Random random = new Random( 42L ); private final ReadableLogChannel channel = mock( ReadableLogChannel.class ); - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private final LogEntryReader reader = mock( LogEntryReader.class ); @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/CommitContentionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/CommitContentionTest.java index af733c554b625..6115072fb80b4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/CommitContentionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/CommitContentionTest.java @@ -98,7 +98,7 @@ private void runAndFinishSecondTransaction() private void createNode() { - try (Transaction transaction = db.beginTx()) + try ( Transaction transaction = db.beginTx() ) { db.createNode(); transaction.success(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/PhysicalLogFilesTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/PhysicalLogFilesTest.java index fde604bb90b25..38ef3c9ce584f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/PhysicalLogFilesTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/PhysicalLogFilesTest.java @@ -170,7 +170,7 @@ public void shouldThrowIfThereIsNoVersionInTheFileName() } } - @Test(expected = NumberFormatException.class) + @Test( expected = NumberFormatException.class ) public void shouldThrowIfVersionIsNotANumber() { // given diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TransactionMetadataCacheTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TransactionMetadataCacheTest.java index fc980e3723c1c..3b54c3686841b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TransactionMetadataCacheTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TransactionMetadataCacheTest.java @@ -83,7 +83,7 @@ public void shouldThrowWhenCachingATxWithNegativeOffsetPosition() cache.cacheTransactionMetadata( txId, position, masterId, authorId, checksum, timestamp ); fail(); } - catch (RuntimeException ex) + catch ( RuntimeException ex ) { assertEquals( "StartEntry.position is " + position, ex.getMessage() ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TransactionMonitorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TransactionMonitorTest.java index eb786f0a10bea..920fe5af11d68 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TransactionMonitorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TransactionMonitorTest.java @@ -49,7 +49,7 @@ public class TransactionMonitorTest public static Collection parameters() { return Arrays.asList( - new Object[]{(ThrowingConsumer) (db) -> {}, false, "read"}, + new Object[]{(ThrowingConsumer) ( db ) -> {}, false, "read"}, new Object[]{(ThrowingConsumer) GraphDatabaseService::createNode, true, "write"} ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/BatchingTransactionAppenderConcurrencyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/BatchingTransactionAppenderConcurrencyTest.java index 54af9c8a4f204..ab8d08b44cf1b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/BatchingTransactionAppenderConcurrencyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/BatchingTransactionAppenderConcurrencyTest.java @@ -323,7 +323,7 @@ protected TransactionToApply tx() NodeRecord before = new NodeRecord( 0 ); NodeRecord after = new NodeRecord( 0 ); after.setInUse( true ); - Command.NodeCommand nodeCommand = new Command.NodeCommand(before, after); + Command.NodeCommand nodeCommand = new Command.NodeCommand( before, after ); PhysicalTransactionRepresentation tx = new PhysicalTransactionRepresentation( asList( (Command) nodeCommand ) ); tx.setHeader( new byte[0], 0, 0, 0, 0, 0, 0 ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogicalTransactionStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogicalTransactionStoreTest.java index 9e059facd2321..3e1dd86e8f4a4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogicalTransactionStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogicalTransactionStoreTest.java @@ -217,7 +217,7 @@ public void allTransactionsRecovered( CommittedTransactionRepresentation lastRec LogPosition positionAfterLastRecoveredTransaction ) throws Exception { } - }, mock(Recovery.Monitor.class))); + }, mock( Recovery.Monitor.class ) ) ); // WHEN try diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerImplTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerImplTest.java index d7d9774be1fe1..668073e06a7f3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerImplTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerImplTest.java @@ -273,7 +273,7 @@ public void tryCheckPointShouldWaitTheCurrentCheckPointingToCompleteNoRunCheckPo @Test public void mustUseIoLimiterFromFlushing() throws Throwable { - limiter = (stamp, ios, flushable) -> 42; + limiter = ( stamp, ios, flushable ) -> 42; when( threshold.isCheckPointingNeeded( anyLong(), eq( INFO ) ) ).thenReturn( true, false ); mockTxIdStore(); CheckPointerImpl checkPointing = checkPointer(); @@ -391,14 +391,14 @@ public void enableLimit() assertThat( observedRushCount.get(), is( 1L ) ); } - @Test(timeout = 5000) + @Test( timeout = 5000 ) public void mustRequestFastestPossibleFlushWhenForceCheckPointIsCalledDuringBackgroundCheckPoint() throws Exception { verifyAsyncActionCausesConcurrentFlushingRush( checkPointer -> checkPointer.forceCheckPoint( new SimpleTriggerInfo( "async" ) ) ); } - @Test(timeout = 5000) + @Test( timeout = 5000 ) public void mustRequestFastestPossibleFlushWhenTryCheckPointIsCalledDuringBackgroundCheckPoint() throws Exception { verifyAsyncActionCausesConcurrentFlushingRush( diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryParserDispatcherV6Test.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryParserDispatcherV6Test.java index 2bd38179e7c32..db265e5d9130a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryParserDispatcherV6Test.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryParserDispatcherV6Test.java @@ -154,7 +154,7 @@ public void shouldParseCheckPointEntry() throws IOException assertFalse( parser.skip() ); } - @Test( expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void shouldThrowWhenParsingPrepareEntry() throws IOException { // when @@ -164,7 +164,7 @@ public void shouldThrowWhenParsingPrepareEntry() throws IOException // it should throw exception } - @Test( expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void shouldThrowWhenParsingTwoPhaseCommitEntry() throws IOException { // when @@ -174,7 +174,7 @@ public void shouldThrowWhenParsingTwoPhaseCommitEntry() throws IOException // it should throw exception } - @Test( expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void shouldThrowWhenParsingDoneEntry() throws IOException { // when diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/TestTxEntries.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/TestTxEntries.java index 416322f524cbf..9f7a43eff40f2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/TestTxEntries.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/TestTxEntries.java @@ -34,7 +34,7 @@ public class TestTxEntries { - private final File storeDir = new File("dir"); + private final File storeDir = new File( "dir" ); @Rule public EphemeralFileSystemRule fs = new EphemeralFileSystemRule(); @@ -48,7 +48,7 @@ public void testStartEntryWrittenOnceOnRollback() throws Exception { final GraphDatabaseService db = new TestGraphDatabaseFactory().setFileSystem( fs.get() ).newImpermanentDatabase( storeDir ); createSomeTransactions( db ); - EphemeralFileSystemAbstraction snapshot = fs.snapshot( () -> db.shutdown() ); + EphemeralFileSystemAbstraction snapshot = fs.snapshot( db::shutdown ); new TestGraphDatabaseFactory().setFileSystem( snapshot ).newImpermanentDatabase( storeDir ).shutdown(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/TestLogPruning.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/TestLogPruning.java index 1663f41943eee..ae4550eae6d76 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/TestLogPruning.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/TestLogPruning.java @@ -283,7 +283,7 @@ public LogVersionedStoreChannel next( LogVersionedStoreChannel channel ) throws try ( PhysicalTransactionCursor physicalTransactionCursor = new PhysicalTransactionCursor<>( channel, new VersionAwareLogEntryReader<>() ) ) { - while ( physicalTransactionCursor.next()) + while ( physicalTransactionCursor.next() ) { counter++; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/workload/TransactionRepresentationFactory.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/workload/TransactionRepresentationFactory.java index 6f8e99b861e80..7e0578fb91815 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/workload/TransactionRepresentationFactory.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/workload/TransactionRepresentationFactory.java @@ -66,7 +66,7 @@ private static class CommandGenerator Command nextCommand() { - return new Command.NodeCommand(nodeRecordGenerator.nextRecord(), nodeRecordGenerator.nextRecord()); + return new Command.NodeCommand( nodeRecordGenerator.nextRecord(), nodeRecordGenerator.nextRecord() ); } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/IntegrityValidatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/IntegrityValidatorTest.java index a3d9ec7cc6190..72e94fc51d6ea 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/IntegrityValidatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/IntegrityValidatorTest.java @@ -44,7 +44,7 @@ public void shouldValidateUniquenessIndexes() throws Exception // Given NeoStores store = mock( NeoStores.class ); IndexingService indexes = mock(IndexingService.class); - IntegrityValidator validator = new IntegrityValidator(store, indexes); + IntegrityValidator validator = new IntegrityValidator( store, indexes ); UniquenessConstraintDescriptor constraint = ConstraintDescriptorFactory.uniqueForLabel( 1, 1 ); doThrow( new UniquePropertyValueValidationException( constraint, @@ -71,7 +71,7 @@ public void deletingNodeWithRelationshipsIsNotAllowed() throws Exception // Given NeoStores store = mock( NeoStores.class ); IndexingService indexes = mock(IndexingService.class); - IntegrityValidator validator = new IntegrityValidator(store, indexes ); + IntegrityValidator validator = new IntegrityValidator( store, indexes ); NodeRecord record = new NodeRecord( 1L, false, 1L, -1L ); record.setInUse( false ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java index d68de609eb482..45fcb619e5a8b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java @@ -243,7 +243,7 @@ public void before() throws Exception { File dir = new File( "dir" ); fs.get().mkdirs( dir ); - @SuppressWarnings("deprecation") + @SuppressWarnings( "deprecation" ) StoreFactory storeFactory = new StoreFactory( dir, Config.empty(), new DefaultIdGeneratorFactory( fs.get() ), pageCacheRule.getPageCache( fs.get() ), fs.get(), NullLogProvider.getInstance() ); neoStores = storeFactory.openAllNeoStores( true ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreViewTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreViewTest.java index e634e5c1b73c8..822eb4c06e4d8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreViewTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreViewTest.java @@ -112,7 +112,7 @@ public void shouldScanExistingNodesForALabel() throws Exception @SuppressWarnings( "unchecked" ) Visitor labelVisitor = mock( Visitor.class ); StoreScan storeScan = - storeView.visitNodes( new int[] {labelId}, (id) -> id == propertyKeyId, visitor, labelVisitor, false ); + storeView.visitNodes( new int[]{labelId}, ( id ) -> id == propertyKeyId, visitor, labelVisitor, false ); // when storeScan.run(); @@ -134,8 +134,8 @@ public void shouldIgnoreDeletedNodesDuringScan() throws Exception NodeUpdateCollectingVisitor visitor = new NodeUpdateCollectingVisitor(); @SuppressWarnings( "unchecked" ) Visitor labelVisitor = mock( Visitor.class ); - StoreScan storeScan = storeView.visitNodes( new int[]{labelId}, (id) -> id == propertyKeyId, - visitor, labelVisitor, false ); + StoreScan storeScan = + storeView.visitNodes( new int[]{labelId}, ( id ) -> id == propertyKeyId, visitor, labelVisitor, false ); // when storeScan.run(); @@ -148,10 +148,10 @@ public void shouldIgnoreDeletedNodesDuringScan() throws Exception public void shouldLockNodesWhileReadingThem() throws Exception { // given - @SuppressWarnings("unchecked") - Visitor visitor = mock( Visitor.class ); - StoreScan storeScan = storeView.visitNodes( new int[] {labelId}, (id) -> id == propertyKeyId, - visitor, null, false ); + @SuppressWarnings( "unchecked" ) + Visitor visitor = mock( Visitor.class ); + StoreScan storeScan = + storeView.visitNodes( new int[]{labelId}, ( id ) -> id == propertyKeyId, visitor, null, false ); // when storeScan.run(); @@ -207,7 +207,7 @@ public void processAllNodeProperties() throws Exception containsInAnyOrder( index1, index2, index3 ) ); } - NodeUpdates add( long nodeId, int propertyKeyId, Object value, long[] labels) + NodeUpdates add( long nodeId, int propertyKeyId, Object value, long[] labels ) { return NodeUpdates.forNode( nodeId, labels ).added( propertyKeyId, value ).build(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/DepthPitfallGraphTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/DepthPitfallGraphTest.java index f8d998b9e3a56..a9bbc23269487 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/DepthPitfallGraphTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/DepthPitfallGraphTest.java @@ -100,7 +100,7 @@ public void testSmallestPossibleInit() throws Exception { Traverser traversal = getGraphDb().traversalDescription().traverse( node( "1" ) ); int count = 0; - try (Transaction transaction = beginTx()) + try ( Transaction transaction = beginTx() ) { for ( Path position : traversal ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/SmallestGraphEverTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/SmallestGraphEverTest.java index 5ac3acb1cd39a..62f6c9b535b77 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/SmallestGraphEverTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/SmallestGraphEverTest.java @@ -126,7 +126,7 @@ public void testRelationshipRecentTraversalCanFinishBreadthFirst() throws Except private void execute( TraversalDescription traversal, Uniqueness uniqueness ) { - try (Transaction transaction = beginTx()) + try ( Transaction transaction = beginTx() ) { Traverser traverser = traversal.uniqueness( uniqueness ).traverse( node( "1" ) ); assertFalse( "empty traversal", Iterables.count( traverser ) == 0 ); @@ -136,7 +136,7 @@ private void execute( TraversalDescription traversal, Uniqueness uniqueness ) @Test public void testTraverseRelationshipsWithStartNodeNotIncluded() throws Exception { - try (Transaction transaction = beginTx()) + try ( Transaction transaction = beginTx() ) { TraversalDescription traversal = getGraphDb().traversalDescription().evaluator( excludeStartPosition() ); assertEquals( 1, Iterables.count( traversal.traverse( node( "1" ) ).relationships() ) ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestBranchState.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestBranchState.java index 3f05e0d226db4..c2165e2465e3b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestBranchState.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestBranchState.java @@ -50,7 +50,7 @@ public void depthAsState() throws Exception */ createGraph( "a to b", "b to c", "c to d", "b to e", "e to f", "f to d", "f to g", "g to h" ); - try (Transaction tx = beginTx()) + try ( Transaction tx = beginTx() ) { DepthStateExpander expander = new DepthStateExpander(); Iterables.count( getGraphDb().traversalDescription().expand( expander, diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestSorting.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestSorting.java index 4f118a8d21840..07b4a2744efce 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestSorting.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestSorting.java @@ -61,7 +61,7 @@ public void sortFriendsByName() throws Exception triplet( me, knows, zack ), triplet( zack, knows, andreas ), triplet( george, knows, andreas ), triplet( andreas, knows, nicholas ) ); - try (Transaction tx = beginTx()) + try ( Transaction tx = beginTx() ) { List nodes = asNodes( abraham, george, dan, zack, andreas, nicholas ); assertEquals( nodes, Iterables.asCollection( getGraphDb().traversalDescription().evaluator( excludeStartPosition() ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestTraversalWithIterable.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestTraversalWithIterable.java index 4cea1d837008a..e3541c82b351d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestTraversalWithIterable.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestTraversalWithIterable.java @@ -45,7 +45,7 @@ public void traverseWithIterableForStartNodes() throws Exception createGraph( "a TO b", "b TO c", "d TO e", "e TO f" ); - try (Transaction tx = beginTx()) + try ( Transaction tx = beginTx() ) { TraversalDescription basicTraverser = getGraphDb().traversalDescription().evaluator( Evaluators.atDepth(2) ); @@ -73,7 +73,7 @@ public void useTraverserInsideTraverser() throws Exception createGraph( "a FIRST d", "a TO b", "b TO c", "d TO e", "e TO f" ); - try (Transaction tx = beginTx()) + try ( Transaction tx = beginTx() ) { TraversalDescription firstTraverser = getGraphDb().traversalDescription() .relationships( RelationshipType.withName( "FIRST" ) ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TraversalTestBase.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TraversalTestBase.java index 053df449729e8..742a1217dd673 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TraversalTestBase.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TraversalTestBase.java @@ -209,7 +209,7 @@ protected void expect( Iterable items, Representation representation, Set expected ) { Collection encounteredItems = new ArrayList(); - try (Transaction tx = beginTx()) + try ( Transaction tx = beginTx() ) { for ( T item : items ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TreeGraphTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TreeGraphTest.java index 03663df9e9b99..9fe5cc73edc10 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TreeGraphTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TreeGraphTest.java @@ -124,7 +124,7 @@ public void testBreadthFirst() throws Exception levels.push( new HashSet<>( asList( "2", "3", "4" ) ) ); levels.push( new HashSet<>( asList( "1" ) ) ); - try (Transaction tx = beginTx();) + try ( Transaction tx = beginTx() ) { assertLevels( traverser, levels ); tx.success(); @@ -154,7 +154,7 @@ public void testPostorderDepthFirstReturnsDeeperNodesFirst() Traverser traverser = getGraphDb().traversalDescription().order( POSTORDER_DEPTH_FIRST ).traverse( node( "1" ) ); int i = 0; List encounteredNodes = new ArrayList<>(); - try (Transaction tx = beginTx()) + try ( Transaction tx = beginTx() ) { for ( Path pos : traverser ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/CappedLoggerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/CappedLoggerTest.java index 5849c0a0d17e5..ebb8f8bfa14ad 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/CappedLoggerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/CappedLoggerTest.java @@ -50,7 +50,7 @@ public interface LogMethod void log( @Nonnull CappedLogger logger, @Nonnull String msg, @Nonnull Throwable cause ); } - @Parameterized.Parameters(name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static Iterable parameters() { LogMethod debug = new LogMethod() diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestArrayMap.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestArrayMap.java index 175d8957cb2ab..59d99590c136b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestArrayMap.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestArrayMap.java @@ -37,18 +37,18 @@ public void testArrayMap() assertTrue( map.get( "key1" ) == null ); map.put( "key1", 0 ); - assertEquals( new Integer(0), map.get( "key1" ) ); - assertEquals( new Integer(0), map.get( "key1" ) ); + assertEquals( new Integer( 0 ), map.get( "key1" ) ); + assertEquals( new Integer( 0 ), map.get( "key1" ) ); map.put( "key1", 1 ); - assertEquals( new Integer(1), map.get( "key1" ) ); + assertEquals( new Integer( 1 ), map.get( "key1" ) ); map.put( "key2", 0 ); - assertEquals( new Integer(0), map.get( "key2" ) ); + assertEquals( new Integer( 0 ), map.get( "key2" ) ); map.put( "key2", 2 ); - assertEquals( new Integer(2), map.get( "key2" ) ); - assertEquals( new Integer(2), map.remove( "key2" ) ); + assertEquals( new Integer( 2 ), map.get( "key2" ) ); + assertEquals( new Integer( 2 ), map.remove( "key2" ) ); assertTrue( map.get( "key2" ) == null ); - assertEquals( new Integer(1), map.get( "key1" ) ); - assertEquals( new Integer(1), map.remove( "key1" ) ); + assertEquals( new Integer( 1 ), map.get( "key1" ) ); + assertEquals( new Integer( 1 ), map.remove( "key1" ) ); assertTrue( map.get( "key1" ) == null ); map.put( "key1", 1 ); @@ -56,19 +56,19 @@ public void testArrayMap() map.put( "key3", 3 ); map.put( "key4", 4 ); map.put( "key5", 5 ); - assertEquals( new Integer(5), map.get( "key5" ) ); - assertEquals( new Integer(4), map.get( "key4" ) ); - assertEquals( new Integer(3), map.get( "key3" ) ); - assertEquals( new Integer(2), map.get( "key2" ) ); - assertEquals( new Integer(1), map.get( "key1" ) ); - assertEquals( new Integer(5), map.remove( "key5" ) ); - assertEquals( new Integer(1), map.get( "key1" ) ); - assertEquals( new Integer(4), map.get( "key4" ) ); - assertEquals( new Integer(3), map.get( "key3" ) ); - assertEquals( new Integer(2), map.get( "key2" ) ); - assertEquals( new Integer(3), map.remove( "key3" ) ); - assertEquals( new Integer(1), map.remove( "key1" ) ); - assertEquals( new Integer(2), map.remove( "key2" ) ); + assertEquals( new Integer( 5 ), map.get( "key5" ) ); + assertEquals( new Integer( 4 ), map.get( "key4" ) ); + assertEquals( new Integer( 3 ), map.get( "key3" ) ); + assertEquals( new Integer( 2 ), map.get( "key2" ) ); + assertEquals( new Integer( 1 ), map.get( "key1" ) ); + assertEquals( new Integer( 5 ), map.remove( "key5" ) ); + assertEquals( new Integer( 1 ), map.get( "key1" ) ); + assertEquals( new Integer( 4 ), map.get( "key4" ) ); + assertEquals( new Integer( 3 ), map.get( "key3" ) ); + assertEquals( new Integer( 2 ), map.get( "key2" ) ); + assertEquals( new Integer( 3 ), map.remove( "key3" ) ); + assertEquals( new Integer( 1 ), map.remove( "key1" ) ); + assertEquals( new Integer( 2 ), map.remove( "key2" ) ); for ( int i = 0; i < 100; i++ ) { @@ -76,11 +76,11 @@ public void testArrayMap() } for ( int i = 0; i < 100; i++ ) { - assertEquals( new Integer(i), map.get( "key" + i) ); + assertEquals( new Integer( i ), map.get( "key" + i ) ); } for ( int i = 0; i < 100; i++ ) { - assertEquals( new Integer(i), map.remove( "key" + i) ); + assertEquals( new Integer( i ), map.remove( "key" + i ) ); } for ( int i = 0; i < 100; i++ ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/VersionedHashMapTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/VersionedHashMapTest.java index baf090430fbd1..682ba92a6c9b3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/VersionedHashMapTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/VersionedHashMapTest.java @@ -202,7 +202,7 @@ public void shouldHandleResizing() throws Exception public void shouldAllowRemovalsWhileIteratingEvenInFaceOfResizing() throws Exception { // Given - VersionedHashMap map = new VersionedHashMap<>(16, 5.0f); + VersionedHashMap map = new VersionedHashMap<>( 16, 5.0f ); for ( int i = 0; i < 128; i++ ) { map.put( i, true ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/SimpleBitSetTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/SimpleBitSetTest.java index a4b1823500a7e..9f8a7e475a201 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/SimpleBitSetTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/SimpleBitSetTest.java @@ -38,7 +38,7 @@ public class SimpleBitSetTest public void put() throws Exception { // Given - SimpleBitSet set = new SimpleBitSet(16); + SimpleBitSet set = new SimpleBitSet( 16 ); // When set.put( 2 ); @@ -59,7 +59,7 @@ public void put() throws Exception public void putAndRemove() throws Exception { // Given - SimpleBitSet set = new SimpleBitSet(16); + SimpleBitSet set = new SimpleBitSet( 16 ); // When set.put( 2 ); @@ -79,8 +79,8 @@ public void putAndRemove() throws Exception public void putOtherBitSet() throws Exception { // Given - SimpleBitSet set = new SimpleBitSet(16); - SimpleBitSet otherSet = new SimpleBitSet(16); + SimpleBitSet set = new SimpleBitSet( 16 ); + SimpleBitSet otherSet = new SimpleBitSet( 16 ); otherSet.put( 4 ); otherSet.put( 14 ); @@ -106,8 +106,8 @@ public void putOtherBitSet() throws Exception public void removeOtherBitSet() throws Exception { // Given - SimpleBitSet set = new SimpleBitSet(16); - SimpleBitSet otherSet = new SimpleBitSet(16); + SimpleBitSet set = new SimpleBitSet( 16 ); + SimpleBitSet otherSet = new SimpleBitSet( 16 ); otherSet.put( 4 ); otherSet.put( 12 ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/TimedRepositoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/TimedRepositoryTest.java index 2ecdb34a88561..0d420cef13860 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/TimedRepositoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/TimedRepositoryTest.java @@ -289,7 +289,7 @@ private static class NonStoppableCleaner implements Runnable @Override public void run() { - while (!stop) + while ( !stop ) { timedRepository.run(); } @@ -321,7 +321,7 @@ public void accept( Long aLong ) reaperLatch.countDown(); } - public void await(String message, long timeout, TimeUnit timeUnit) throws InterruptedException + public void await( String message, long timeout, TimeUnit timeUnit ) throws InterruptedException { if ( !reaperLatch.await( timeout, timeUnit ) ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/recovery/LatestCheckPointFinderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/recovery/LatestCheckPointFinderTest.java index d4a1f1c6c4028..72a3d65df876f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/recovery/LatestCheckPointFinderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/recovery/LatestCheckPointFinderTest.java @@ -387,12 +387,12 @@ private final void setupLogFiles( LogCreator... logFiles ) throws IOException private LogCreator logFile( Entry... entries ) { - return (logVersion, positions) -> + return ( logVersion, positions ) -> { try { AtomicLong lastTxId = new AtomicLong(); - Supplier lastTxIdSupplier = () -> lastTxId.get(); + Supplier lastTxIdSupplier = lastTxId::get; LogVersionRepository logVersionRepository = new DeadSimpleLogVersionRepository( logVersion ); LifeSupport life = new LifeSupport(); life.start(); diff --git a/community/kernel/src/test/java/org/neo4j/metatest/TestEphemeralFileChannel.java b/community/kernel/src/test/java/org/neo4j/metatest/TestEphemeralFileChannel.java index 479cc9e1fc123..8400eec70780f 100644 --- a/community/kernel/src/test/java/org/neo4j/metatest/TestEphemeralFileChannel.java +++ b/community/kernel/src/test/java/org/neo4j/metatest/TestEphemeralFileChannel.java @@ -52,7 +52,7 @@ public void smoke() throws Exception buffer.put( new byte[23] ); // zeros buffer.flip(); channel.write( buffer ); - channel = fs.open( new File("yo"), "rw" ); + channel = fs.open( new File( "yo" ), "rw" ); long longValue = 1234567890L; // [1].....[2]........[1234567890L]... diff --git a/community/kernel/src/test/java/org/neo4j/test/DbRepresentation.java b/community/kernel/src/test/java/org/neo4j/test/DbRepresentation.java index 53bf8397e1645..6c965a7680e20 100644 --- a/community/kernel/src/test/java/org/neo4j/test/DbRepresentation.java +++ b/community/kernel/src/test/java/org/neo4j/test/DbRepresentation.java @@ -133,7 +133,9 @@ public Collection compareWith( DbRepresentation other ) for ( Long id : other.nodes.keySet() ) { if ( !nodes.containsKey( id ) ) - { diff.add( "Other has node " + id + " which I don't" ); } + { + diff.add( "Other has node " + id + " which I don't" ); + } } return diffList; } @@ -208,7 +210,9 @@ private Map> checkIndex( GraphDatabaseService db private void compareIndex( NodeRep other, DiffReport diff ) { if ( other.index == index ) - { return; } + { + return; + } Collection allIndexes = new HashSet<>(); allIndexes.addAll( index.keySet() ); allIndexes.addAll( other.index.keySet() ); @@ -251,10 +255,14 @@ private void compareIndex( NodeRep other, DiffReport diff ) protected void compareWith( NodeRep other, DiffReport diff ) { if ( other.id != id ) - { diff.add( "Id differs mine:" + id + ", other:" + other.id ); } + { + diff.add( "Id differs mine:" + id + ", other:" + other.id ); + } properties.compareWith( other.properties, diff ); if ( index != null && other.index != null ) - { compareIndex( other, diff ); } + { + compareIndex( other, diff ); + } compareRelationships( other, diff ); } @@ -288,7 +296,9 @@ public int hashCode() result += outRelationships.hashCode() * 13; result += id * 17; if ( index != null ) - { result += index.hashCode() * 19; } + { + result += index.hashCode() * 19; + } return result; } diff --git a/community/kernel/src/test/java/org/neo4j/test/GraphDescription.java b/community/kernel/src/test/java/org/neo4j/test/GraphDescription.java index fd321b0cfb5d5..716dea2b3d214 100644 --- a/community/kernel/src/test/java/org/neo4j/test/GraphDescription.java +++ b/community/kernel/src/test/java/org/neo4j/test/GraphDescription.java @@ -381,7 +381,7 @@ private static void createIfAbsent( Map nodes, String name, String } String[] labelNameArray = joinedLabels.toArray(new String[joinedLabels.size()]); - nodes.put( name, new NodeWithAddedLabels(preexistingNode, labelNameArray)); + nodes.put( name, new NodeWithAddedLabels( preexistingNode, labelNameArray ) ); } } diff --git a/community/kernel/src/test/java/org/neo4j/test/LimitedFileSystemGraphDatabase.java b/community/kernel/src/test/java/org/neo4j/test/LimitedFileSystemGraphDatabase.java index ede6f7ee88039..0e3d1a3c0f2f6 100644 --- a/community/kernel/src/test/java/org/neo4j/test/LimitedFileSystemGraphDatabase.java +++ b/community/kernel/src/test/java/org/neo4j/test/LimitedFileSystemGraphDatabase.java @@ -50,7 +50,7 @@ protected void create( File storeDir, Map params, GraphDatabaseF @Override protected PlatformModule createPlatform( File storeDir, Config config, Dependencies dependencies, GraphDatabaseFacade facade ) { - return new ImpermanentPlatformModule( storeDir, config, databaseInfo, dependencies, facade) + return new ImpermanentPlatformModule( storeDir, config, databaseInfo, dependencies, facade ) { @Override protected FileSystemAbstraction createFileSystemAbstraction() diff --git a/community/kernel/src/test/java/org/neo4j/test/OnDemandJobScheduler.java b/community/kernel/src/test/java/org/neo4j/test/OnDemandJobScheduler.java index eb665807135d8..462362d902916 100644 --- a/community/kernel/src/test/java/org/neo4j/test/OnDemandJobScheduler.java +++ b/community/kernel/src/test/java/org/neo4j/test/OnDemandJobScheduler.java @@ -43,7 +43,7 @@ public OnDemandJobScheduler() this( true ); } - public OnDemandJobScheduler( boolean removeJobsAfterExecution) + public OnDemandJobScheduler( boolean removeJobsAfterExecution ) { this.removeJobsAfterExecution = removeJobsAfterExecution; } diff --git a/community/kernel/src/test/java/org/neo4j/test/Race.java b/community/kernel/src/test/java/org/neo4j/test/Race.java index a1a5c7baafcd9..f8643b19f0ce6 100644 --- a/community/kernel/src/test/java/org/neo4j/test/Race.java +++ b/community/kernel/src/test/java/org/neo4j/test/Race.java @@ -222,7 +222,9 @@ private class Contestant extends Thread Contestant( Runnable code, int nr ) { super( code, "Contestant#" + nr ); - this.setUncaughtExceptionHandler( (thread,error) -> {} ); + this.setUncaughtExceptionHandler( ( thread, error ) -> + { + } ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/test/StreamConsumer.java b/community/kernel/src/test/java/org/neo4j/test/StreamConsumer.java index 4b0beab5099c3..aae4489f6e638 100644 --- a/community/kernel/src/test/java/org/neo4j/test/StreamConsumer.java +++ b/community/kernel/src/test/java/org/neo4j/test/StreamConsumer.java @@ -75,9 +75,9 @@ public StreamConsumer( InputStream in, OutputStream out, boolean quiet, String p this.quiet = quiet; this.prefix = prefix; this.failureHandler = failureHandler; - this.in = new BufferedReader(new InputStreamReader( in )); + this.in = new BufferedReader( new InputStreamReader( in ) ); this.out = new OutputStreamWriter( out ); - this.stackTraceOfOrigin = new Exception("Stack trace of thread that created this StreamConsumer"); + this.stackTraceOfOrigin = new Exception( "Stack trace of thread that created this StreamConsumer" ); } @Override @@ -86,7 +86,7 @@ public void run() try { String line; - while ( ( line = in.readLine()) != null) + while ( (line = in.readLine()) != null ) { if ( !quiet ) { diff --git a/community/kernel/src/test/java/org/neo4j/test/TestData.java b/community/kernel/src/test/java/org/neo4j/test/TestData.java index 00c9f7d5b8172..a78bd0cdf1986 100644 --- a/community/kernel/src/test/java/org/neo4j/test/TestData.java +++ b/community/kernel/src/test/java/org/neo4j/test/TestData.java @@ -69,7 +69,7 @@ private static final class Lazy productOrFactory = new Factory( graph, title, documentation ); } - @SuppressWarnings( "unchecked"/*cast to T*/) + @SuppressWarnings( "unchecked" ) T get( Producer producer, boolean create ) { Object result = productOrFactory; diff --git a/community/kernel/src/test/java/org/neo4j/test/TestGraphDatabaseFactory.java b/community/kernel/src/test/java/org/neo4j/test/TestGraphDatabaseFactory.java index 112e61c801cf7..22fc9129257d3 100644 --- a/community/kernel/src/test/java/org/neo4j/test/TestGraphDatabaseFactory.java +++ b/community/kernel/src/test/java/org/neo4j/test/TestGraphDatabaseFactory.java @@ -235,14 +235,14 @@ static class TestGraphDatabaseFacadeFactory extends GraphDatabaseFacadeFactory TestGraphDatabaseFacadeFactory( TestGraphDatabaseFactoryState state, boolean impermanent, DatabaseInfo databaseInfo, Function editionFactory ) { - super(databaseInfo, editionFactory); + super( databaseInfo, editionFactory ); this.state = state; this.impermanent = impermanent; } TestGraphDatabaseFacadeFactory( TestGraphDatabaseFactoryState state ) { - this(state, false); + this( state, false ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/test/impl/EphemeralIdGenerator.java b/community/kernel/src/test/java/org/neo4j/test/impl/EphemeralIdGenerator.java index 44f7df8851369..d9f9229129c8c 100644 --- a/community/kernel/src/test/java/org/neo4j/test/impl/EphemeralIdGenerator.java +++ b/community/kernel/src/test/java/org/neo4j/test/impl/EphemeralIdGenerator.java @@ -126,7 +126,7 @@ public long getHighId() @Override public void freeId( long id ) { - if (freeList != null) + if ( freeList != null ) { freeList.add( id ); } diff --git a/community/kernel/src/test/java/org/neo4j/test/mockito/answer/AwaitAnswer.java b/community/kernel/src/test/java/org/neo4j/test/mockito/answer/AwaitAnswer.java index 94d534fda6a23..0dc245f47e132 100644 --- a/community/kernel/src/test/java/org/neo4j/test/mockito/answer/AwaitAnswer.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/answer/AwaitAnswer.java @@ -28,20 +28,19 @@ public class AwaitAnswer implements Answer { - public static AwaitAnswer afterAwaiting( CountDownLatch latch ) - { - return new AwaitAnswer<>( latch, null ); - } - private final CountDownLatch latch; private final Answer result; - public AwaitAnswer( CountDownLatch latch, Answer result ) { this.latch = latch; this.result = result; } + public static AwaitAnswer afterAwaiting( CountDownLatch latch ) + { + return new AwaitAnswer<>( latch, null ); + } + @Override public T answer( InvocationOnMock invocation ) throws Throwable { @@ -54,13 +53,13 @@ public Answer then( Answer result ) return new AwaitAnswer<>( latch, result ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public Answer thenReturn( R result ) { return then( (Answer) new Returns( result ) ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public Answer thenThrow( Throwable exception ) { return then( (Answer) new ThrowsException( exception ) ); diff --git a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/IterableMatcher.java b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/IterableMatcher.java index 7a1be625a9f7c..bf71f70f207c7 100644 --- a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/IterableMatcher.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/IterableMatcher.java @@ -42,7 +42,7 @@ private IterableMatcher( Iterable toMatch ) @Override protected boolean matchesSafely( Iterable objects ) { - if ( Iterables.count( toMatch ) != Iterables.count( objects )) + if ( Iterables.count( toMatch ) != Iterables.count( objects ) ) { return false; } diff --git a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java index fb7f0c90ecb74..31d0a5b7d8018 100644 --- a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java @@ -334,9 +334,9 @@ private boolean propertyValuesEqual( Object expected, Object readValue ) return expected.equals( readValue ); } - private String formatValue(Object v) + private String formatValue( Object v ) { - if (v instanceof String) + if ( v instanceof String ) { return String.format("'%s'", v.toString()); } @@ -388,7 +388,7 @@ public static Deferred findNodesByLabelAndProperty( final Label label, fin final Object propertyValue, final GraphDatabaseService db ) { - return new Deferred(db) + return new Deferred( db ) { @Override protected Iterable manifest() diff --git a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/RootCauseMatcher.java b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/RootCauseMatcher.java index 4ea74d3ce17d1..4d7bebcee0ea8 100644 --- a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/RootCauseMatcher.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/RootCauseMatcher.java @@ -47,7 +47,7 @@ public void describeTo( Description description ) { description.appendText( "Expected root cause of " ).appendValue( rootCause ).appendText( " with message: " ) .appendValue( message ).appendText( ", but " ); - if (cause != null) + if ( cause != null ) { description.appendText( "was: " ).appendValue( cause.getClass() ) .appendText( " with message: " ).appendValue( cause.getMessage() ); diff --git a/community/kernel/src/test/java/org/neo4j/test/mockito/mock/Properties.java b/community/kernel/src/test/java/org/neo4j/test/mockito/mock/Properties.java index 4fc8eda30c1e2..cb220fc735b33 100644 --- a/community/kernel/src/test/java/org/neo4j/test/mockito/mock/Properties.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/mock/Properties.java @@ -61,7 +61,7 @@ private Properties( Map properties ) public Object answer( InvocationOnMock invocation ) throws Throwable { Object[] arguments = invocation.getArguments(); - @SuppressWarnings("SuspiciousMethodCalls") + @SuppressWarnings( "SuspiciousMethodCalls" ) Object result = properties.get( arguments[0] ); if ( result == null ) { diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/DatabaseRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/DatabaseRule.java index d7810066f3e0c..053131842a891 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/DatabaseRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/DatabaseRule.java @@ -216,7 +216,7 @@ public Transaction beginTx() } @Override - public Transaction beginTx( long timeout, TimeUnit timeUnit) + public Transaction beginTx( long timeout, TimeUnit timeUnit ) { return getGraphDatabaseAPI().beginTx( timeout, timeUnit ); } diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/GraphTransactionRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/GraphTransactionRule.java index 82a29f45adcaf..fbfdcabfbf6e0 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/GraphTransactionRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/GraphTransactionRule.java @@ -66,7 +66,7 @@ public void success() { try { - if (tx != null) + if ( tx != null ) { tx.success(); tx.close(); @@ -82,7 +82,7 @@ public void failure() { try { - if (tx != null) + if ( tx != null ) { tx.failure(); tx.close(); diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/Resources.java b/community/kernel/src/test/java/org/neo4j/test/rule/Resources.java index 3de68d678a07a..1e9099e347d70 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/Resources.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/Resources.java @@ -44,8 +44,8 @@ public final class Resources implements TestRule { - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.METHOD) + @Retention( RetentionPolicy.RUNTIME ) + @Target( ElementType.METHOD ) public @interface Life { InitialLifecycle value(); diff --git a/community/kernel/src/test/java/org/neo4j/test/runner/ParameterizedSuiteRunner.java b/community/kernel/src/test/java/org/neo4j/test/runner/ParameterizedSuiteRunner.java index 0b531a0dd5aa8..f77a93e7e08dc 100644 --- a/community/kernel/src/test/java/org/neo4j/test/runner/ParameterizedSuiteRunner.java +++ b/community/kernel/src/test/java/org/neo4j/test/runner/ParameterizedSuiteRunner.java @@ -36,7 +36,7 @@ public class ParameterizedSuiteRunner extends Suite { - @SuppressWarnings("unused"/*used by jUnit through reflection*/) + @SuppressWarnings( "unused"/*used by jUnit through reflection*/ ) public ParameterizedSuiteRunner( Class testClass ) throws InitializationError { this( testClass, new ParameterBuilder( testClass ) ); diff --git a/community/kernel/src/test/java/org/neo4j/test/subprocess/SubProcess.java b/community/kernel/src/test/java/org/neo4j/test/subprocess/SubProcess.java index fdd9b8c6e1ca9..158be84e3435f 100644 --- a/community/kernel/src/test/java/org/neo4j/test/subprocess/SubProcess.java +++ b/community/kernel/src/test/java/org/neo4j/test/subprocess/SubProcess.java @@ -197,7 +197,7 @@ private String classPath() return stream.filter( classPathFilter ).collect( Collectors.joining( File.pathSeparator ) ); } - private static Process start(boolean inheritOutput, String... args ) + private static Process start( boolean inheritOutput, String... args ) { ProcessBuilder builder = new ProcessBuilder( args ); if ( inheritOutput ) diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java index 57336fc150712..dd5cf7f7914ac 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java @@ -1099,10 +1099,13 @@ public void testCleanupEmptyPropertyRecords() throws Exception properties.put("firstName", "Edward"); properties.put("lastName", "Shevchenko"); properties.put("gender", "male"); - properties.put("birthday", new SimpleDateFormat("yyyy-MM-dd").parse( "1987-11-08" ).getTime()); + properties.put( "birthday", new SimpleDateFormat( "yyyy-MM-dd" ).parse( "1987-11-08" ).getTime() ); properties.put("birthday_month", 11); properties.put("birthday_day", 8); - properties.put("creationDate", new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").parse( "2010-04-22T18:05:40.912+0000" ).getTime()); + long time = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss.SSSZ" ) + .parse( "2010-04-22T18:05:40.912+0000" ) + .getTime(); + properties.put("creationDate", time ); properties.put("locationIP", "46.151.255.205"); properties.put( "browserUsed", "Firefox" ); properties.put( "email", new String[0] ); diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCacheTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCacheTest.java index dad7c367d4a70..8ea5b51de04b8 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCacheTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCacheTest.java @@ -315,7 +315,7 @@ public void shouldVisitChangedNodes() throws Exception { // WHEN (sparse) - NodeChangeVisitor visitor = (nodeId, array) -> + NodeChangeVisitor visitor = ( nodeId, array ) -> { // THEN (sparse) assertTrue( "Unexpected sparse change reported for " + nodeId, keySparseChanged.remove( nodeId ) ); @@ -327,7 +327,7 @@ public void shouldVisitChangedNodes() throws Exception { // WHEN (dense) - NodeChangeVisitor visitor = (nodeId, array) -> + NodeChangeVisitor visitor = ( nodeId, array ) -> { // THEN (dense) assertTrue( "Unexpected dense change reported for " + nodeId, keyDenseChanged.remove( nodeId ) ); diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NumberArrayTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NumberArrayTest.java index 0b0066a9377e4..6fe6b04010e9b 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NumberArrayTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NumberArrayTest.java @@ -67,36 +67,32 @@ public static Collection arrays() { list.add( line( factory.newIntArray( INDEXES, -1 ), - (random) -> random.nextInt( 1_000_000_000 ), - (array, index, value) -> array.set( index, (Integer) value ), - (array, index) -> array.get( index ) ) ); + ( random ) -> random.nextInt( 1_000_000_000 ), + ( array, index, value ) -> array.set( index, (Integer) value ), IntArray::get ) ); list.add( line( factory.newDynamicIntArray( INDEXES / 100, -1 ), - (random) -> random.nextInt( 1_000_000_000 ), - (array, index, value) -> array.set( index, (Integer) value ), - (array, index) -> array.get( index ) ) ); + ( random ) -> random.nextInt( 1_000_000_000 ), + ( array, index, value ) -> array.set( index, (Integer) value ), IntArray::get ) ); list.add( line( factory.newLongArray( INDEXES, -1 ), - (random) -> random.nextLong( 1_000_000_000 ), - (array, index, value) -> array.set( index, (Long) value ), - (array, index) -> array.get( index ) ) ); + ( random ) -> random.nextLong( 1_000_000_000 ), + ( array, index, value ) -> array.set( index, (Long) value ), LongArray::get ) ); list.add( line( factory.newDynamicLongArray( INDEXES / 100, -1 ), - (random) -> random.nextLong( 1_000_000_000 ), - (array, index, value) -> array.set( index, (Long) value ), - (array, index) -> array.get( index ) ) ); + ( random ) -> random.nextLong( 1_000_000_000 ), + ( array, index, value ) -> array.set( index, (Long) value ), LongArray::get ) ); list.add( line( factory.newByteArray( INDEXES, new byte[] {-1, -1, -1, -1, -1} ), - (random) -> random.nextInt( 1_000_000_000 ), - (array, index, value) -> array.setInt( index, 1, (Integer) value ), - (array, index) -> array.getInt( index, 1 ) ) ); + ( random ) -> random.nextInt( 1_000_000_000 ), + ( array, index, value ) -> array.setInt( index, 1, (Integer) value ), + ( array, index ) -> array.getInt( index, 1 ) ) ); list.add( line( factory.newDynamicByteArray( INDEXES / 100, new byte[] {-1, -1, -1, -1, -1} ), - (random) -> random.nextInt( 1_000_000_000 ), - (array, index, value) -> array.setInt( index, 1, (Integer) value ), - (array, index) -> array.getInt( index, 1 ) ) ); + ( random ) -> random.nextInt( 1_000_000_000 ), + ( array, index, value ) -> array.setInt( index, 1, (Integer) value ), + ( array, index ) -> array.getInt( index, 1 ) ) ); } return list; } @@ -142,7 +138,7 @@ public void shouldGetAndSetRandomItems() throws Exception for ( int index = 0; index < INDEXES; index++ ) { Object value = reader.read( index % 2 == 0 ? array : array.at( index ), index ); - Object expectedValue = key.containsKey( index ) ? key.get( index ) : defaultValue; + Object expectedValue = key.getOrDefault( index, defaultValue ); assertEquals( expectedValue, value ); } } diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/ExternalPropertiesDecoratorTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/ExternalPropertiesDecoratorTest.java index a2d346a4e5c9c..da2aac4719f8a 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/ExternalPropertiesDecoratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/ExternalPropertiesDecoratorTest.java @@ -56,8 +56,7 @@ public void shouldCombineNodesWithExternalPropertiesFile() throws Exception IdType idType = IdType.STRING; Decorator externalPropertiesDecorator = new ExternalPropertiesDecorator( DataFactories.data( NO_NODE_DECORATOR, readable( propertyData ) ), - defaultFormatNodeFileHeader(), config, idType, UpdateBehaviour.ADD, - silentBadCollector( 0 )); + defaultFormatNodeFileHeader(), config, idType, UpdateBehaviour.ADD, silentBadCollector( 0 ) ); // WHEN assertProperties( externalPropertiesDecorator.apply( node( "1", "key", "value1" ) ), @@ -85,8 +84,7 @@ public void shouldCombineNodesWithExternalPropertyArraysFile() throws Exception IdType idType = IdType.STRING; Decorator externalPropertiesDecorator = new ExternalPropertiesDecorator( DataFactories.data( NO_NODE_DECORATOR, readable( propertyData ) ), - defaultFormatNodeFileHeader(), config, idType, UpdateBehaviour.ADD, - silentBadCollector( 0 )); + defaultFormatNodeFileHeader(), config, idType, UpdateBehaviour.ADD, silentBadCollector( 0 ) ); // WHEN assertProperties( externalPropertiesDecorator.apply( node( "1", "key", "value1", "email", "existing" ) ), diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/InputGroupsDeserializerTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/InputGroupsDeserializerTest.java index bf7b7224f5f16..ac880f6b804fb 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/InputGroupsDeserializerTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/InputGroupsDeserializerTest.java @@ -62,7 +62,7 @@ public void shouldBeAbleToAskForSourceInformationEvenBetweenTwoSources() throws final AtomicReference> deserializerTestHack = new AtomicReference<>( null ); InputGroupsDeserializer deserializer = new InputGroupsDeserializer<>( data.iterator(), defaultFormatNodeFileHeader(), lowBufferSize( COMMAS, true ), INTEGER, - Runtime.getRuntime().availableProcessors(), 1, (header,stream,decorator,validator) -> + Runtime.getRuntime().availableProcessors(), 1, ( header, stream, decorator, validator ) -> { // This is the point where the currentInput field in InputGroupsDeserializer was null // so ensure that's no longer the case, just by poking those source methods right here and now. diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/ParallelInputEntityDeserializerTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/ParallelInputEntityDeserializerTest.java index 0fb5818d7536c..ce265157661da 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/ParallelInputEntityDeserializerTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/ParallelInputEntityDeserializerTest.java @@ -41,7 +41,6 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; - import static org.neo4j.csv.reader.Readables.wrap; import static org.neo4j.unsafe.impl.batchimport.input.csv.Configuration.COMMAS; import static org.neo4j.unsafe.impl.batchimport.input.csv.DataFactories.defaultFormatNodeFileHeader; @@ -72,7 +71,7 @@ public int bufferSize() Groups groups = new Groups(); Set observedProcessingThreads = new CopyOnWriteArraySet<>(); int threads = 4; - DeserializerFactory deserializerFactory = (header,chunk,decorator,validator) -> + DeserializerFactory deserializerFactory = ( header, chunk, decorator, validator ) -> { observedProcessingThreads.add( Thread.currentThread() ); // Make sure there will be 4 different processing threads doing this diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/CoarseBoundedProgressExecutionMonitorTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/CoarseBoundedProgressExecutionMonitorTest.java index 6f7459cf6fee9..d57bb34392fa4 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/CoarseBoundedProgressExecutionMonitorTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/CoarseBoundedProgressExecutionMonitorTest.java @@ -31,13 +31,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; - import static org.neo4j.unsafe.impl.batchimport.stats.Keys.done_batches; @RunWith( Parameterized.class ) public class CoarseBoundedProgressExecutionMonitorTest { - @Parameterized.Parameters(name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static Iterable parameters() { return Arrays.asList(1, 10, 123); @@ -51,7 +50,7 @@ public void shouldReportProgressOnSingleExecution() throws Exception { // GIVEN Configuration config = config(); - ProgressExecutionMonitor progressExecutionMonitor = new ProgressExecutionMonitor(batchSize, config()); + ProgressExecutionMonitor progressExecutionMonitor = new ProgressExecutionMonitor( batchSize, config() ); // WHEN long total = monitorSingleStageExecution( progressExecutionMonitor, config ); @@ -64,7 +63,7 @@ public void shouldReportProgressOnSingleExecution() throws Exception public void progressOnMultipleExecutions() { Configuration config = config(); - ProgressExecutionMonitor progressExecutionMonitor = new ProgressExecutionMonitor(batchSize, config ); + ProgressExecutionMonitor progressExecutionMonitor = new ProgressExecutionMonitor( batchSize, config ); long total = progressExecutionMonitor.total(); diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/TicketedProcessingTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/TicketedProcessingTest.java index 49790a987fec7..7773d3fab7492 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/TicketedProcessingTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/TicketedProcessingTest.java @@ -57,7 +57,7 @@ public void shouldReturnTicketsInOrder() throws Exception // GIVEN int items = 1_000; ParkStrategy park = new ParkStrategy.Park( 2, MILLISECONDS ); - BiFunction processor = (from,ignore) -> + BiFunction processor = ( from, ignore ) -> { if ( ThreadLocalRandom.current().nextFloat() < 0.01f ) { @@ -103,7 +103,7 @@ public void shouldNotBeAbleToSubmitTooFarAhead() throws Exception { // GIVEN try ( TicketedProcessing processing = new TicketedProcessing<>( "Parser", 2, - (job,state) -> + ( job, state ) -> { awaitLatch( job.latch ); return parseInt( job.string ); @@ -143,7 +143,7 @@ public void shouldNoticeSlurpPanic() throws Exception // GIVEN IllegalStateException failure = new IllegalStateException( "Consistently failing" ); try ( TicketedProcessing processing = new TicketedProcessing<>( "Parser", 2, - (job,state) -> parseInt( job.string ), () -> null ) ) + ( job, state ) -> parseInt( job.string ), () -> null ) ) { processing.processors( 1 ); diff --git a/community/logging/src/main/java/org/neo4j/logging/AbstractPrintWriterLogger.java b/community/logging/src/main/java/org/neo4j/logging/AbstractPrintWriterLogger.java index 89d7481997c1d..e52eff399d948 100644 --- a/community/logging/src/main/java/org/neo4j/logging/AbstractPrintWriterLogger.java +++ b/community/logging/src/main/java/org/neo4j/logging/AbstractPrintWriterLogger.java @@ -54,7 +54,7 @@ public void log( @Nonnull String message ) { requireNonNull( message, "message must not be null" ); PrintWriter writer; - synchronized (lock) + synchronized ( lock ) { writer = writerSupplier.get(); writeLog( writer, message ); @@ -72,7 +72,7 @@ public void log( @Nonnull String message, @Nonnull Throwable throwable ) return; } PrintWriter writer; - synchronized (lock) + synchronized ( lock ) { writer = writerSupplier.get(); writeLog( writer, message, throwable ); @@ -91,7 +91,7 @@ public void log( @Nonnull String format, @Nullable Object... arguments ) } String message = String.format( format, arguments ); PrintWriter writer; - synchronized (lock) + synchronized ( lock ) { writer = writerSupplier.get(); writeLog( writer, message ); @@ -104,7 +104,7 @@ public void bulk( @Nonnull Consumer consumer ) { requireNonNull( consumer, "consumer must not be null" ); PrintWriter writer; - synchronized (lock) + synchronized ( lock ) { writer = writerSupplier.get(); consumer.accept( getBulkLogger( writer, lock ) ); diff --git a/community/logging/src/main/java/org/neo4j/logging/BufferingLog.java b/community/logging/src/main/java/org/neo4j/logging/BufferingLog.java index fd242b98ca16b..86c50cf3eb3f0 100644 --- a/community/logging/src/main/java/org/neo4j/logging/BufferingLog.java +++ b/community/logging/src/main/java/org/neo4j/logging/BufferingLog.java @@ -29,17 +29,17 @@ /** * Buffers all messages sent to it, and is able to replay those messages into * another Logger. - * + *

* This can be used to start up services that need logging when they start, but * where, for one reason or another, we have not yet set up proper logging in * the application lifecycle. - * + *

* This will replay messages in the order they are received, *however*, it will * not preserve the time stamps of the original messages. - * + *

* You should not use this for logging messages where the time stamps are * important. - * + *

* You should also not use this logger, when there is a risk that it can be * subjected to an unbounded quantity of log messages, since the buffer keeps * all messages until it gets a chance to replay them. @@ -61,7 +61,7 @@ private abstract class BufferingLogger implements Logger public void log( @Nonnull String message ) { LogMessage logMessage = buildMessage( message ); - synchronized (buffer) + synchronized ( buffer ) { buffer.add( logMessage ); } @@ -73,7 +73,7 @@ public void log( @Nonnull String message ) public void log( @Nonnull final String message, @Nonnull final Throwable throwable ) { LogMessage logMessage = buildMessage( message, throwable ); - synchronized (buffer) + synchronized ( buffer ) { buffer.add( logMessage ); } @@ -85,7 +85,7 @@ public void log( @Nonnull final String message, @Nonnull final Throwable throwab public void log( @Nonnull String format, @Nonnull Object... arguments ) { LogMessage logMessage = buildMessage( format, arguments ); - synchronized (buffer) + synchronized ( buffer ) { buffer.add( logMessage ); } @@ -96,7 +96,7 @@ public void log( @Nonnull String format, @Nonnull Object... arguments ) @Override public void bulk( @Nonnull Consumer consumer ) { - synchronized (buffer) + synchronized ( buffer ) { consumer.accept( this ); } @@ -384,7 +384,7 @@ public Logger errorLogger() @Override public void bulk( @Nonnull Consumer consumer ) { - synchronized (buffer) + synchronized ( buffer ) { consumer.accept( this ); } @@ -397,7 +397,7 @@ public void bulk( @Nonnull Consumer consumer ) */ public void replayInto( Log other ) { - synchronized (buffer) + synchronized ( buffer ) { LogMessage message = buffer.poll(); while ( message != null ) @@ -411,7 +411,7 @@ public void replayInto( Log other ) @Override public String toString() { - synchronized (buffer) + synchronized ( buffer ) { StringWriter stringWriter = new StringWriter(); PrintWriter sb = new PrintWriter( stringWriter ); diff --git a/community/logging/src/main/java/org/neo4j/logging/FormattedLog.java b/community/logging/src/main/java/org/neo4j/logging/FormattedLog.java index 4696afff17a08..3df5f6acc09df 100644 --- a/community/logging/src/main/java/org/neo4j/logging/FormattedLog.java +++ b/community/logging/src/main/java/org/neo4j/logging/FormattedLog.java @@ -435,7 +435,7 @@ public Logger errorLogger() public void bulk( @Nonnull Consumer consumer ) { PrintWriter writer; - synchronized (lock) + synchronized ( lock ) { writer = writerSupplier.get(); consumer.accept( new FormattedLog( currentDateSupplier, Suppliers.singleton( writer ), timezone, lock, category, levelRef.get(), false ) ); diff --git a/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java b/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java index 4f4dc5b1893d2..1fef3d08e11ad 100644 --- a/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java +++ b/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java @@ -515,7 +515,7 @@ public void assertExactly( LogMatcher... expected ) { Iterator expectedIterator = asList( expected ).iterator(); - synchronized (logCalls) + synchronized ( logCalls ) { Iterator callsIterator = logCalls.iterator(); @@ -591,7 +591,7 @@ public void assertContainsThrowablesMatching( int logSkipCount, Throwable... th public void assertAtLeastOnce( LogMatcher... expected ) { Set expectedMatchers = new HashSet<>( Arrays.asList( expected ) ); - synchronized (logCalls) + synchronized ( logCalls ) { for ( LogCall logCall : logCalls ) { @@ -618,7 +618,7 @@ public void assertAtLeastOnce( LogMatcher... expected ) public void assertNone( LogMatcher notExpected ) { - synchronized (logCalls) + synchronized ( logCalls ) { for ( LogCall logCall : logCalls ) { @@ -634,7 +634,7 @@ public void assertNone( LogMatcher notExpected ) public void assertContainsLogCallContaining( String partOfMessage ) { - synchronized (logCalls) + synchronized ( logCalls ) { for ( LogCall logCall : logCalls ) { @@ -651,7 +651,7 @@ public void assertContainsLogCallContaining( String partOfMessage ) public void assertContainsMessageContaining( String partOfMessage ) { - synchronized (logCalls) + synchronized ( logCalls ) { if ( containsMessage( partOfMessage ) ) { @@ -689,7 +689,7 @@ public void assertNoMessagesContaining( String partOfMessage ) public void assertContainsMessageMatching( Matcher messageMatcher ) { - synchronized (logCalls) + synchronized ( logCalls ) { for ( LogCall logCall : logCalls ) { diff --git a/community/logging/src/test/java/org/neo4j/logging/RotatingFileOutputStreamSupplierTest.java b/community/logging/src/test/java/org/neo4j/logging/RotatingFileOutputStreamSupplierTest.java index d1db2b740489a..6f23c8476edf1 100644 --- a/community/logging/src/test/java/org/neo4j/logging/RotatingFileOutputStreamSupplierTest.java +++ b/community/logging/src/test/java/org/neo4j/logging/RotatingFileOutputStreamSupplierTest.java @@ -580,7 +580,7 @@ private class LockingPrintWriter extends PrintWriter } - void withLock(Callable callable) throws Exception + void withLock( Callable callable ) throws Exception { synchronized ( lock ) { diff --git a/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/loader/JarLoaderSupplier.java b/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/loader/JarLoaderSupplier.java index 0ba7cdf4ce1e0..e39da828f127e 100644 --- a/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/loader/JarLoaderSupplier.java +++ b/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/loader/JarLoaderSupplier.java @@ -29,12 +29,12 @@ public class JarLoaderSupplier implements Supplier { private String[] jarPaths; - public static JarLoaderSupplier of(String... jarPaths) + public static JarLoaderSupplier of( String... jarPaths ) { return new JarLoaderSupplier( jarPaths ); } - private JarLoaderSupplier(String... jarPaths) + private JarLoaderSupplier( String... jarPaths ) { this.jarPaths = jarPaths; } diff --git a/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgrader.java b/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgrader.java index 3d67374a0cab4..2531bf189d146 100644 --- a/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgrader.java +++ b/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgrader.java @@ -103,7 +103,7 @@ public void upgradeIndexes() throws LegacyIndexMigrationException IndexUpgraderWrapper lucene5Upgrader = createIndexUpgrader( getLucene5JarPaths() ) ) { List indexPaths = pathStream.filter( getIndexPathFilter() ).collect( Collectors.toList() ); - for (Path indexPath : indexPaths ) + for ( Path indexPath : indexPaths ) { try { @@ -172,7 +172,7 @@ private static Predicate getIndexPathFilter() private static boolean isIndexDirectory( Path path ) throws IOException { - try (Stream pathStream = Files.list( path )) + try ( Stream pathStream = Files.list( path ) ) { return pathStream .filter( child -> child.getFileName().toString().startsWith( SEGMENTS_FILE_NAME_PREFIX ) ) diff --git a/community/lucene-index-upgrade/src/test/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgraderTest.java b/community/lucene-index-upgrade/src/test/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgraderTest.java index 05f1571038559..9d40ed553171e 100644 --- a/community/lucene-index-upgrade/src/test/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgraderTest.java +++ b/community/lucene-index-upgrade/src/test/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgraderTest.java @@ -82,12 +82,12 @@ public void pointIncorrectIndexOnMigrationFailure() throws URISyntaxException, L TrackingLuceneLegacyIndexUpgrader indexUpgrader = new TrackingLuceneLegacyIndexUpgrader( indexFolder, true ); expectedException.expect( LegacyIndexMigrationException.class ); - expectedException.expect( new LegacyIndexMigrationExceptionBaseMatcher("index1", "index2") ); + expectedException.expect( new LegacyIndexMigrationExceptionBaseMatcher( "index1", "index2" ) ); indexUpgrader.upgradeIndexes(); } - private Path createPathForResource(String resourceName) throws URISyntaxException + private Path createPathForResource( String resourceName ) throws URISyntaxException { return Paths.get( getClass().getClassLoader().getResource( resourceName ).toURI() ); } @@ -114,7 +114,7 @@ protected boolean matchesSafely( LegacyIndexMigrationException item, Description { String brokendIndexName = item.getFailedIndexName(); boolean matched = Arrays.asList(failedIndexNames).contains( brokendIndexName ); - if (!matched) + if ( !matched ) { mismatchDescription.appendText( "Failed index is: " ).appendText( brokendIndexName ); } @@ -167,7 +167,7 @@ private class IndexUpgraderWrapperStub extends IndexUpgraderWrapper @Override public void upgradeIndex( Path indexPath ) throws Throwable { - if (failIndexUpgrade) + if ( failIndexUpgrade ) { throw new RuntimeException( "Fail index migration: " + indexPath ); } diff --git a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneBatchInserterIndex.java b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneBatchInserterIndex.java index ab4a6a96bf1b0..4472738873f4d 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneBatchInserterIndex.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneBatchInserterIndex.java @@ -244,7 +244,7 @@ private void removeFromCache( long entityId, String key, Object value ) Collection ids = cache.get( valueAsString ); if ( ids != null ) { - ids.remove( new EntityId.IdData(entityId) ); + ids.remove( new EntityId.IdData( entityId ) ); } } } diff --git a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneDataSource.java b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneDataSource.java index abdc62074a9ae..dac7295a392c9 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneDataSource.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneDataSource.java @@ -139,7 +139,7 @@ public void init() closed = false; } - public static File getLuceneIndexStoreDirectory(File storeDir) + public static File getLuceneIndexStoreDirectory( File storeDir ) { return new File( storeDir, "index" ); } diff --git a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneIndexImplementation.java b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneIndexImplementation.java index d1d18b4898c99..6a0df361112c3 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneIndexImplementation.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneIndexImplementation.java @@ -97,7 +97,7 @@ public void shutdown() throws Throwable } @Override - public File getIndexImplementationDirectory(File storeDir) + public File getIndexImplementationDirectory( File storeDir ) { return LuceneDataSource.getLuceneIndexStoreDirectory(storeDir); } diff --git a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneLegacyIndex.java b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneLegacyIndex.java index b46f3899cf374..6e561e5e31b05 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneLegacyIndex.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneLegacyIndex.java @@ -328,7 +328,7 @@ private PrimitiveLongSet gatherIdsModifiedInTransactionState( List sim { // Add from fulltext tx state PrimitiveLongIterator valuesIterator = docValuesCollector.getValuesIterator( LuceneLegacyIndex.KEY_DOC_ID ); - while (valuesIterator.hasNext()) + while ( valuesIterator.hasNext() ) { set.add( valuesIterator.next() ); } diff --git a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneTransactionState.java b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneTransactionState.java index ce994db57b9ce..ab89b76d38f5b 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneTransactionState.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneTransactionState.java @@ -120,11 +120,11 @@ static Collection merge( Collection c1, Collection } else if ( c1 != null && c2 != null ) { - if (c1.isEmpty()) + if ( c1.isEmpty() ) { return c2; } - if (c2.isEmpty()) + if ( c2.isEmpty() ) { return c1; } diff --git a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/ReadOnlyIndexReference.java b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/ReadOnlyIndexReference.java index 7c69b129f360f..aa9f7c6b980e7 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/ReadOnlyIndexReference.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/ReadOnlyIndexReference.java @@ -29,7 +29,7 @@ public class ReadOnlyIndexReference extends IndexReference ReadOnlyIndexReference( IndexIdentifier identifier, IndexSearcher searcher ) { - super(identifier, searcher); + super( identifier, searcher ); } @Override @@ -53,7 +53,7 @@ public boolean checkAndClearStale() @Override public void setStale() { - throw new UnsupportedOperationException("Read only indexes can't be marked as stale."); + throw new UnsupportedOperationException( "Read only indexes can't be marked as stale." ); } } diff --git a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReference.java b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReference.java index 651801bf5a576..c10e1a56a0e62 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReference.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReference.java @@ -33,7 +33,7 @@ class WritableIndexReference extends IndexReference WritableIndexReference( IndexIdentifier identifier, IndexSearcher searcher, IndexWriter writer ) { - super(identifier, searcher ); + super( identifier, searcher ); this.writer = writer; } diff --git a/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneLabelScanStoreBuilder.java b/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneLabelScanStoreBuilder.java index 141807b9b94cb..57cbb9d5ad12a 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneLabelScanStoreBuilder.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneLabelScanStoreBuilder.java @@ -29,9 +29,9 @@ import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.api.labelscan.LoggingMonitor; import org.neo4j.kernel.configuration.Config; -import org.neo4j.kernel.impl.factory.OperationalMode; import org.neo4j.kernel.impl.api.index.IndexStoreView; import org.neo4j.kernel.impl.api.scan.FullLabelStream; +import org.neo4j.kernel.impl.factory.OperationalMode; import org.neo4j.logging.LogProvider; import static org.neo4j.kernel.impl.api.scan.LabelScanStoreProvider.getStoreDirectory; @@ -57,7 +57,7 @@ public class LuceneLabelScanStoreBuilder public LuceneLabelScanStoreBuilder( File storeDir, IndexStoreView storeView, FileSystemAbstraction fileSystem, Config config, OperationalMode operationalMode, LogProvider logProvider ) { - this (storeDir, () -> storeView, fileSystem, config, operationalMode, logProvider); + this( storeDir, () -> storeView, fileSystem, config, operationalMode, logProvider ); } public LuceneLabelScanStoreBuilder( File storeDir, Supplier storeViewSupplier, diff --git a/community/lucene-index/src/main/java/org/neo4j/index/lucene/ValueContext.java b/community/lucene-index/src/main/java/org/neo4j/index/lucene/ValueContext.java index b9806c8f7a39b..5df1724a51e0d 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/lucene/ValueContext.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/lucene/ValueContext.java @@ -81,8 +81,8 @@ public String toString() * @return A ValueContext that can be used with * {@link org.neo4j.graphdb.index.Index#add(org.neo4j.graphdb.PropertyContainer, String, Object)} */ - public static ValueContext numeric(Number value) + public static ValueContext numeric( Number value ) { - return new ValueContext(value).indexNumeric(); + return new ValueContext( value ).indexNumeric(); } } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/ReadOnlyAbstractDatabaseIndex.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/ReadOnlyAbstractDatabaseIndex.java index 1fec6c745c2b6..5ac9adf1c1828 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/ReadOnlyAbstractDatabaseIndex.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/ReadOnlyAbstractDatabaseIndex.java @@ -35,7 +35,7 @@ public abstract class ReadOnlyAbstractDatabaseIndex 0;remaining -= read) + for ( long remaining = source.length(), read; remaining > 0; remaining -= read ) { read = min( remaining, buffer.length ); source.readBytes( buffer, 0, (int) read ); @@ -158,7 +158,7 @@ public void dumpToZip( ZipOutputStream zip, byte[] scratchPad ) final class UncloseableDirectory extends FilterDirectory { - public UncloseableDirectory(Directory delegate) + public UncloseableDirectory( Directory delegate ) { super( delegate ); } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndex.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndex.java index c791d9c597c69..3611356aba9b2 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndex.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndex.java @@ -104,6 +104,6 @@ private LabelScanReader createSimpleReader( List partiti private LabelScanReader createPartitionedReader( List partitions ) throws IOException { List searchers = acquireSearchers( partitions ); - return new PartitionedLuceneLabelScanStoreReader(searchers, storageStrategy ); + return new PartitionedLuceneLabelScanStoreReader( searchers, storageStrategy ); } } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreExtension.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreExtension.java index ed99f673152cd..5a878fe8c1e18 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreExtension.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreExtension.java @@ -42,7 +42,7 @@ import static org.neo4j.kernel.api.impl.index.LuceneKernelExtensions.directoryFactory; -@Service.Implementation(KernelExtensionFactory.class) +@Service.Implementation( KernelExtensionFactory.class ) public class LuceneLabelScanStoreExtension extends KernelExtensionFactory { private static final String NAME = LabelIndex.LUCENE.name(); diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/LuceneAllEntriesLabelScanReader.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/LuceneAllEntriesLabelScanReader.java index 2ca1b281c75ff..9def53f44cd31 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/LuceneAllEntriesLabelScanReader.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/LuceneAllEntriesLabelScanReader.java @@ -108,7 +108,7 @@ else if ( format.isLabelBitmapField( field ) ) final long[] labelIds; final Bitmap[] bitmaps; - if (i < expectedLabelFields) + if ( i < expectedLabelFields ) { labelIds = Arrays.copyOf( scratchLabelIds, i ); bitmaps = Arrays.copyOf( scratchBitmaps, i ); diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/PartitionedLuceneLabelScanStoreReader.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/PartitionedLuceneLabelScanStoreReader.java index 163db6fc40a2e..bf85530736ada 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/PartitionedLuceneLabelScanStoreReader.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/PartitionedLuceneLabelScanStoreReader.java @@ -51,7 +51,7 @@ public PartitionedLuceneLabelScanStoreReader( List searchers, .collect( Collectors.toList() ) ); } - PartitionedLuceneLabelScanStoreReader(List readers ) + PartitionedLuceneLabelScanStoreReader( List readers ) { this.storeReaders = readers; } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/writer/PartitionedLuceneLabelScanWriter.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/writer/PartitionedLuceneLabelScanWriter.java index 0b0aa3359ce76..f40d3811ef930 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/writer/PartitionedLuceneLabelScanWriter.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/writer/PartitionedLuceneLabelScanWriter.java @@ -63,7 +63,7 @@ public class PartitionedLuceneLabelScanWriter implements LabelScanWriter private long currentRange; private WritableDatabaseLabelScanIndex index; - public PartitionedLuceneLabelScanWriter( WritableDatabaseLabelScanIndex index, BitmapDocumentFormat format) + public PartitionedLuceneLabelScanWriter( WritableDatabaseLabelScanIndex index, BitmapDocumentFormat format ) { this.index = index; this.format = format; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructure.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructure.java index 151fbddb40e4f..f95a3bd3be927 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructure.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructure.java @@ -218,7 +218,7 @@ private static class PrefixMultiTermsQuery extends MultiTermQuery PrefixMultiTermsQuery( Term term ) { - super(term.field()); + super( term.field() ); this.term = term; } @@ -253,7 +253,7 @@ protected AcceptStatus accept( BytesRef term ) throws IOException } } - public static Field encodeValueField(Object value) + public static Field encodeValueField( Object value ) { ValueEncoding encoding = ValueEncoding.forValue( value ); return encoding.encodeField( encoding.key(), value ); diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderFactory.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderFactory.java index 780c9217e20ea..2766e3a0f57be 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderFactory.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderFactory.java @@ -32,7 +32,7 @@ import static org.neo4j.kernel.api.impl.index.LuceneKernelExtensions.directoryFactory; -@Service.Implementation(KernelExtensionFactory.class) +@Service.Implementation( KernelExtensionFactory.class ) public class LuceneSchemaIndexProviderFactory extends KernelExtensionFactory { diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/DirectNonUniqueIndexSampler.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/DirectNonUniqueIndexSampler.java index 92bb04eb9eec4..5736b0525cdc0 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/DirectNonUniqueIndexSampler.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/DirectNonUniqueIndexSampler.java @@ -75,7 +75,7 @@ public IndexSample result() luceneIndex.flush(); luceneIndex.maybeRefreshBlocking(); - try (IndexReader indexReader = luceneIndex.getIndexReader()) + try ( IndexReader indexReader = luceneIndex.getIndexReader() ) { IndexSampler sampler = indexReader.createSampler(); return sampler.sampleIndex(); diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/CompositeDuplicateCheckingCollector.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/CompositeDuplicateCheckingCollector.java index 06ea207954de3..c9dbaa92febdc 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/CompositeDuplicateCheckingCollector.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/CompositeDuplicateCheckingCollector.java @@ -39,7 +39,7 @@ public class CompositeDuplicateCheckingCollector extends DuplicateCheckingCollec public CompositeDuplicateCheckingCollector( PropertyAccessor accessor, int[] propertyKeyIds ) { - super(accessor, -1); + super( accessor, -1 ); this.propertyKeyIds = propertyKeyIds; actualValues = new CompositeEntrySet(); } diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/Contains.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/Contains.java index c34c09413425c..39fb2d6018957 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/Contains.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/Contains.java @@ -65,7 +65,7 @@ public boolean matchesSafely( IndexHits indexHits ) @Override public void describeTo( Description description ) { - if (message != null) + if ( message != null ) { description.appendText( message ); } diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/IndexTypeTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/IndexTypeTest.java index 998867e59c26f..b4e242f718efa 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/IndexTypeTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/IndexTypeTest.java @@ -47,7 +47,7 @@ public class IndexTypeTest @Parameterized.Parameter( 1 ) public int documentFieldsPerUserField; - @Parameterized.Parameters(name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static Iterable indexTypes() { Map customIndexTypeConfig = MapUtil.stringMap( LuceneIndexImplementation.KEY_TYPE, "exact", diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/ReadOnlyIndexReferenceFactoryTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/ReadOnlyIndexReferenceFactoryTest.java index bed9db3c399ea..87db25052a8f9 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/ReadOnlyIndexReferenceFactoryTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/ReadOnlyIndexReferenceFactoryTest.java @@ -104,7 +104,7 @@ private void setupIndexInfrastructure() throws IOException private ReadOnlyIndexReferenceFactory getReadOnlyIndexReferenceFactory() { - return new ReadOnlyIndexReferenceFactory( filesystemFacade, new File( getStoreDir(), "index"), + return new ReadOnlyIndexReferenceFactory( filesystemFacade, new File( getStoreDir(), "index" ), new IndexTypeCache( indexStore ) ); } diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestAutoIndexReopen.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestAutoIndexReopen.java index f3963da008c11..052c83d1fa979 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestAutoIndexReopen.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestAutoIndexReopen.java @@ -19,21 +19,21 @@ */ package org.neo4j.index.impl.lucene.legacy; -import java.util.HashMap; - import org.junit.After; -import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; +import java.util.HashMap; + import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; +import org.neo4j.graphdb.index.ReadableRelationshipIndex; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.graphdb.index.ReadableRelationshipIndex; +import static org.junit.Assert.assertEquals; public class TestAutoIndexReopen { @@ -50,7 +50,7 @@ public void startDb() graphDb = (GraphDatabaseAPI) new TestGraphDatabaseFactory(). newImpermanentDatabaseBuilder().setConfig(new HashMap<>()).newGraphDatabase(); - try (Transaction tx = graphDb.beginTx()) + try ( Transaction tx = graphDb.beginTx() ) { // Create the node and relationship auto-indexes graphDb.index().getNodeAutoIndexer().setEnabled(true); @@ -63,7 +63,7 @@ public void startDb() tx.success(); } - try (Transaction tx = graphDb.beginTx()) + try ( Transaction tx = graphDb.beginTx() ) { Node node1 = graphDb.createNode(); Node node2 = graphDb.createNode(); @@ -83,7 +83,7 @@ public void startDb() @After public void stopDb() { - if (graphDb != null) + if ( graphDb != null ) { graphDb.shutdown(); } @@ -99,18 +99,15 @@ private ReadableRelationshipIndex relationShipAutoIndex() public void testForceOpenIfChanged() { // do some actions to force the indexreader to be reopened - try (Transaction tx = graphDb.beginTx()) + try ( Transaction tx = graphDb.beginTx() ) { - Node node1 = graphDb.getNodeById(id1); - Node node2 = graphDb.getNodeById(id2); - Node node3 = graphDb.getNodeById(id3); + Node node1 = graphDb.getNodeById( id1 ); + Node node2 = graphDb.getNodeById( id2 ); + Node node3 = graphDb.getNodeById( id3 ); node1.setProperty("np2", "test property"); - node1.getRelationships(RelationshipType.withName("FOO")).forEach(r -> - { - r.delete(); - }); + node1.getRelationships( RelationshipType.withName( "FOO" ) ).forEach( Relationship::delete ); // check first node assertEquals(0, relationShipAutoIndex().get("type", "FOO", node1, node3).size()); diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestLuceneIndex.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestLuceneIndex.java index b0943d0618111..bad58184303a6 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestLuceneIndex.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestLuceneIndex.java @@ -193,7 +193,7 @@ public void queryIndexWithSortByNumericAfterOtherPropertyUpdate() doubleNumericPropertyValueForAllNodesWithLabel( index, priceProperty, nodeLabel ); queryAndSortNodesByNumericProperty( index, yearProperty ); - queryAndSortNodesByNumericProperty( index, priceProperty, (value) -> value * 2 ); + queryAndSortNodesByNumericProperty( index, priceProperty, ( value ) -> value * 2 ); } @Test @@ -1660,7 +1660,7 @@ public void updateIndex() throws Exception Index index = nodeIndex( LuceneIndexImplementation.EXACT_CONFIG ); Node n = graphDb.createNode(); - index.add(n, NUMERIC, new ValueContext(5).indexNumeric()); + index.add( n, NUMERIC, new ValueContext( 5 ).indexNumeric() ); index.add(n, TEXT, "text"); index.add(n, TEXT_1, "text"); commitTx(); @@ -2275,7 +2275,8 @@ private void doubleNumericPropertyValueForAllNodesWithLabel( Index index, { node.setProperty( numericProperty, (Integer) node.getProperty( numericProperty ) * 2 ); index.remove( node, numericProperty ); - index.add( node, numericProperty, new ValueContext( node.getProperty( numericProperty )).indexNumeric() ); + index.add( node, numericProperty, + new ValueContext( node.getProperty( numericProperty ) ).indexNumeric() ); } ); transaction.success(); } diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReferenceFactoryTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReferenceFactoryTest.java index 7d49ae7029df3..b0caa657f2ca1 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReferenceFactoryTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReferenceFactoryTest.java @@ -115,7 +115,7 @@ private IndexReference createIndexReference( WritableIndexReferenceFactory index private WritableIndexReferenceFactory createFactory() { - return new WritableIndexReferenceFactory( filesystemFacade, new File( getStoreDir(), "index"), + return new WritableIndexReferenceFactory( filesystemFacade, new File( getStoreDir(), "index" ), new IndexTypeCache( indexStore ) ); } diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReferenceTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReferenceTest.java index e42fa85f0530c..ea5c44a3be104 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReferenceTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReferenceTest.java @@ -41,7 +41,7 @@ public class WritableIndexReferenceTest private IndexSearcher searcher = mock( IndexSearcher.class ); private IndexWriter indexWriter = mock( IndexWriter.class ); private CloseTrackingIndexReader reader = new CloseTrackingIndexReader(); - private WritableIndexReference indexReference = new WritableIndexReference( identifier, searcher, indexWriter); + private WritableIndexReference indexReference = new WritableIndexReference( identifier, searcher, indexWriter ); @Before public void setUp() diff --git a/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTest.java b/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTest.java index 150c8471b7b8d..69b3a278c7f1e 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTest.java @@ -60,10 +60,7 @@ import static org.junit.Assert.assertFalse; import static org.neo4j.graphdb.Label.label; -/** - * Arbitrary recovery scenarios boiled down to as small tests as possible - */ -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class UniqueIndexRecoveryTest { @Rule @@ -76,7 +73,7 @@ public class UniqueIndexRecoveryTest private final TestGraphDatabaseFactory factory = new TestGraphDatabaseFactory(); private GraphDatabaseAPI db; - @Parameterized.Parameters(name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static Collection parameters() { return asList( @@ -84,7 +81,7 @@ public static Collection parameters() new Object[]{new InMemoryIndexProviderFactory()} ); } - @Parameterized.Parameter(0) + @Parameterized.Parameter( 0 ) public KernelExtensionFactory kernelExtensionFactory; @Before diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneAllDocumentsReaderTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneAllDocumentsReaderTest.java index 77141afb9d9d0..84688b4b4ad61 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneAllDocumentsReaderTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneAllDocumentsReaderTest.java @@ -78,7 +78,7 @@ public void readAllDocuments() private LuceneAllDocumentsReader createAllDocumentsReader() { - return new LuceneAllDocumentsReader(createPartitionReaders()); + return new LuceneAllDocumentsReader( createPartitionReaders() ); } private List createPartitionReaders() @@ -106,15 +106,15 @@ private static PartitionSearcher createPartitionSearcher( int maxDoc, int partit return partitionSearcher; } - private static String uniqueDocValue(int value, int partition, int maxSize ) + private static String uniqueDocValue( int value, int partition, int maxSize ) { return String.valueOf( value + (partition * maxSize) ); } - private static Document createDocument(String value) + private static Document createDocument( String value ) { Document document = new Document(); - document.add( new StoredField( "value", value) ); + document.add( new StoredField( "value", value ) ); return document; } } diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseIndexAccessorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseIndexAccessorTest.java index 5bfea31002efc..860301db9be04 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseIndexAccessorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseIndexAccessorTest.java @@ -73,9 +73,9 @@ public class DatabaseIndexAccessorTest @ClassRule public static final EphemeralFileSystemRule fileSystemRule = new EphemeralFileSystemRule(); - @Parameterized.Parameter(0) + @Parameterized.Parameter( 0 ) public IndexDescriptor index; - @Parameterized.Parameter(1) + @Parameterized.Parameter( 1 ) public IOFunction accessorFactory; private LuceneIndexAccessor accessor; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/UniqueIndexApplicationIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/UniqueIndexApplicationIT.java index 9c7ed2e69ec60..c80ebff51bfc3 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/UniqueIndexApplicationIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/UniqueIndexApplicationIT.java @@ -51,7 +51,7 @@ import static org.neo4j.test.DatabaseFunctions.setProperty; import static org.neo4j.test.DatabaseFunctions.uniquenessConstraint; -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class UniqueIndexApplicationIT { @Rule @@ -59,7 +59,7 @@ public class UniqueIndexApplicationIT private final Function createIndex; - @Parameterized.Parameters(name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static List indexTypes() { return asList( createIndex( index( label( "Label1" ), "key1" ) ), diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java index fbcf2051f1063..16bd64d6f71d0 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java @@ -153,7 +153,7 @@ private IndexingService getIndexingService( GraphDatabaseService database ) return getDependencyResolver(database).resolveDependency( IndexingService.class ); } - private LabelTokenHolder getLabelTokenHolder(GraphDatabaseService database) + private LabelTokenHolder getLabelTokenHolder( GraphDatabaseService database ) { return getDependencyResolver( database ).resolveDependency( LabelTokenHolder.class ); } @@ -166,7 +166,7 @@ private DependencyResolver getDependencyResolver( GraphDatabaseService database private void createData( GraphDatabaseService database, int numberOfNodes ) { int index = 0; - while (index < numberOfNodes) + while ( index < numberOfNodes ) { try ( Transaction transaction = database.beginTx() ) { diff --git a/community/monitor-logging/src/main/java/org/neo4j/ext/monitorlogging/MonitorLoggingExtensionFactory.java b/community/monitor-logging/src/main/java/org/neo4j/ext/monitorlogging/MonitorLoggingExtensionFactory.java index 9923b8ed1345c..38330cee3520a 100644 --- a/community/monitor-logging/src/main/java/org/neo4j/ext/monitorlogging/MonitorLoggingExtensionFactory.java +++ b/community/monitor-logging/src/main/java/org/neo4j/ext/monitorlogging/MonitorLoggingExtensionFactory.java @@ -29,7 +29,7 @@ import org.neo4j.kernel.lifecycle.Lifecycle; import org.neo4j.kernel.monitoring.Monitors; -@Service.Implementation(KernelExtensionFactory.class) +@Service.Implementation( KernelExtensionFactory.class ) public class MonitorLoggingExtensionFactory extends KernelExtensionFactory { diff --git a/community/neo4j-harness/src/main/java/org/neo4j/harness/TestServerBuilders.java b/community/neo4j-harness/src/main/java/org/neo4j/harness/TestServerBuilders.java index 5fd7216a66a8d..3fc334dc11c53 100644 --- a/community/neo4j-harness/src/main/java/org/neo4j/harness/TestServerBuilders.java +++ b/community/neo4j-harness/src/main/java/org/neo4j/harness/TestServerBuilders.java @@ -40,7 +40,7 @@ public static TestServerBuilder newInProcessBuilder() /** * Create a builder capable of starting an in-process Neo4j instance, running in a subdirectory of the specified directory. */ - public static TestServerBuilder newInProcessBuilder(File workingDirectory) + public static TestServerBuilder newInProcessBuilder( File workingDirectory ) { return new InProcessServerBuilder( workingDirectory ); } diff --git a/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java b/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java index 9ec354d20f62a..32e1b3143f018 100644 --- a/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java +++ b/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java @@ -250,7 +250,7 @@ private String randomFolderName() return DigestUtils.md5Hex( Long.toString( ThreadLocalRandom.current().nextLong() ) ); } - private int freePort(int startRange, int endRange) + private int freePort( int startRange, int endRange ) { try { @@ -301,7 +301,7 @@ interface Dependencies Neo4jHarnessExtensions( HarnessRegisteredProcs userProcs ) { - super("harness"); + super( "harness" ); this.userProcs = userProcs; } diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTest.java index 61b4067738931..bbcecf09946af 100644 --- a/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTest.java +++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTest.java @@ -54,7 +54,7 @@ public void shouldAccepSingleCypherFileAsFixture() throws Exception { // Given File targetFolder = testDir.directory(); - File fixture = new File(targetFolder, "fixture.cyp"); + File fixture = new File( targetFolder, "fixture.cyp" ); FileUtils.writeToFile(fixture, "CREATE (u:User)" + "CREATE (a:OtherUser)", false); @@ -76,19 +76,16 @@ public void shouldAcceptFolderWithCypFilesAsFixtures() throws Exception { // Given two files in the root folder File targetFolder = testDir.directory(); - FileUtils.writeToFile( new File(targetFolder, "fixture1.cyp"), - "CREATE (u:User)\n" + - "CREATE (a:OtherUser)", false); - FileUtils.writeToFile( new File(targetFolder, "fixture2.cyp"), - "CREATE (u:User)\n" + - "CREATE (a:OtherUser)", false); + FileUtils.writeToFile( new File( targetFolder, "fixture1.cyp" ), "CREATE (u:User)\n" + "CREATE (a:OtherUser)", + false ); + FileUtils.writeToFile( new File( targetFolder, "fixture2.cyp" ), "CREATE (u:User)\n" + "CREATE (a:OtherUser)", + false ); // And given one file in a sub directory - File subDir = new File(targetFolder, "subdirectory"); + File subDir = new File( targetFolder, "subdirectory" ); subDir.mkdir(); - FileUtils.writeToFile( new File(subDir, "subDirFixture.cyp"), - "CREATE (u:User)\n" + - "CREATE (a:OtherUser)", false); + FileUtils.writeToFile( new File( subDir, "subDirFixture.cyp" ), "CREATE (u:User)\n" + "CREATE (a:OtherUser)", + false ); // When try ( ServerControls server = getServerBuilder( targetFolder ).withFixture( targetFolder ).newServer() ) @@ -153,10 +150,9 @@ public void shouldIgnoreEmptyFixtureFiles() throws Exception { // Given two files in the root folder File targetFolder = testDir.directory(); - FileUtils.writeToFile( new File(targetFolder, "fixture1.cyp"), - "CREATE (u:User)\n" + - "CREATE (a:OtherUser)", false); - FileUtils.writeToFile( new File(targetFolder, "fixture2.cyp"), "", false); + FileUtils.writeToFile( new File( targetFolder, "fixture1.cyp" ), "CREATE (u:User)\n" + "CREATE (a:OtherUser)", + false ); + FileUtils.writeToFile( new File( targetFolder, "fixture2.cyp" ), "", false ); // When try ( ServerControls server = getServerBuilder( targetFolder ) @@ -175,7 +171,7 @@ public void shouldHandleFixturesWithSyntaxErrorsGracefully() throws Exception { // Given two files in the root folder File targetFolder = testDir.directory(); - FileUtils.writeToFile( new File(targetFolder, "fixture1.cyp"), "this is not a valid cypher statement", false); + FileUtils.writeToFile( new File( targetFolder, "fixture1.cyp" ), "this is not a valid cypher statement", false ); // When try ( ServerControls ignore = getServerBuilder( targetFolder ) diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTest.java index 7ea89dd86dfe6..21506589b5481 100644 --- a/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTest.java +++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTest.java @@ -83,7 +83,7 @@ public class InProcessBuilderTest public void shouldLaunchAServerInSpecifiedDirectory() throws Exception { // Given - File workDir = new File(testDir.directory(), "specific"); + File workDir = new File( testDir.directory(), "specific" ); workDir.mkdir(); // When diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTest.java index b7f465d06bda3..6058b1a46ea17 100644 --- a/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTest.java +++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTest.java @@ -123,15 +123,16 @@ public void shouldRuleWorkWithExsitingDirectory() } // When a rule with an pre-populated graph db directory is used - final Neo4jRule ruleWithDirectory = new Neo4jRule(testDirectory.directory()).copyFrom( testDirectory.directory()); + final Neo4jRule ruleWithDirectory = + new Neo4jRule( testDirectory.directory() ).copyFrom( testDirectory.directory() ); ruleWithDirectory.apply( new Statement() { @Override public void evaluate() throws Throwable { // Then the database is not empty - Result result = ruleWithDirectory.getGraphDatabaseService().execute( "match (n) return count(n) as " + - "count" ); + Result result = ruleWithDirectory.getGraphDatabaseService() + .execute( "MATCH (n) RETURN count(n) AS " + "count" ); List column = Iterators.asList( result.columnAs( "count" ) ); assertEquals( 1, column.size() ); diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaProceduresTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaProceduresTest.java index c6f51761e80ce..9f3e9b08d2e96 100644 --- a/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaProceduresTest.java +++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaProceduresTest.java @@ -77,7 +77,7 @@ public static class OutputRecord @Context public SomeService service; - @Procedure("hello") + @Procedure( "hello" ) public Stream hello() { OutputRecord t = new OutputRecord(); diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/extensionpackage/MyUnmanagedExtension.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/extensionpackage/MyUnmanagedExtension.java index 11043ffb19ae6..933627d1ee3f5 100644 --- a/community/neo4j-harness/src/test/java/org/neo4j/harness/extensionpackage/MyUnmanagedExtension.java +++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/extensionpackage/MyUnmanagedExtension.java @@ -23,7 +23,7 @@ import javax.ws.rs.Path; import javax.ws.rs.core.Response; -@Path("/myExtension") +@Path( "/myExtension" ) public class MyUnmanagedExtension { @GET diff --git a/community/neo4j-slf4j/src/main/java/org/neo4j/logging/slf4j/Slf4jLog.java b/community/neo4j-slf4j/src/main/java/org/neo4j/logging/slf4j/Slf4jLog.java index 2e9a335e08290..ab531c78c8603 100644 --- a/community/neo4j-slf4j/src/main/java/org/neo4j/logging/slf4j/Slf4jLog.java +++ b/community/neo4j-slf4j/src/main/java/org/neo4j/logging/slf4j/Slf4jLog.java @@ -20,7 +20,6 @@ package org.neo4j.logging.slf4j; import java.util.function.Consumer; - import javax.annotation.Nonnull; import org.neo4j.logging.AbstractLog; @@ -52,7 +51,7 @@ public Slf4jLog( final org.slf4j.Logger slf4jLogger ) @Override public void log( @Nonnull String message ) { - synchronized (lock) + synchronized ( lock ) { slf4jLogger.debug( message ); } @@ -61,7 +60,7 @@ public void log( @Nonnull String message ) @Override public void log( @Nonnull String message, @Nonnull Throwable throwable ) { - synchronized (lock) + synchronized ( lock ) { slf4jLogger.debug( message, throwable ); } @@ -70,7 +69,7 @@ public void log( @Nonnull String message, @Nonnull Throwable throwable ) @Override public void log( @Nonnull String format, @Nonnull Object... arguments ) { - synchronized (lock) + synchronized ( lock ) { slf4jLogger.debug( convertFormat(format), arguments ); } @@ -79,7 +78,7 @@ public void log( @Nonnull String format, @Nonnull Object... arguments ) @Override public void bulk( @Nonnull Consumer consumer ) { - synchronized (lock) + synchronized ( lock ) { consumer.accept( this ); } @@ -91,7 +90,7 @@ public void bulk( @Nonnull Consumer consumer ) @Override public void log( @Nonnull String message ) { - synchronized (lock) + synchronized ( lock ) { slf4jLogger.info( message ); } @@ -100,7 +99,7 @@ public void log( @Nonnull String message ) @Override public void log( @Nonnull String message, @Nonnull Throwable throwable ) { - synchronized (lock) + synchronized ( lock ) { slf4jLogger.info( message, throwable ); } @@ -109,7 +108,7 @@ public void log( @Nonnull String message, @Nonnull Throwable throwable ) @Override public void log( @Nonnull String format, @Nonnull Object... arguments ) { - synchronized (lock) + synchronized ( lock ) { slf4jLogger.info( convertFormat(format), arguments ); } @@ -118,7 +117,7 @@ public void log( @Nonnull String format, @Nonnull Object... arguments ) @Override public void bulk( @Nonnull Consumer consumer ) { - synchronized (lock) + synchronized ( lock ) { consumer.accept( this ); } @@ -130,7 +129,7 @@ public void bulk( @Nonnull Consumer consumer ) @Override public void log( @Nonnull String message ) { - synchronized (lock) + synchronized ( lock ) { slf4jLogger.warn( message ); } @@ -139,7 +138,7 @@ public void log( @Nonnull String message ) @Override public void log( @Nonnull String message, @Nonnull Throwable throwable ) { - synchronized (lock) + synchronized ( lock ) { slf4jLogger.warn( message, throwable ); } @@ -148,7 +147,7 @@ public void log( @Nonnull String message, @Nonnull Throwable throwable ) @Override public void log( @Nonnull String format, @Nonnull Object... arguments ) { - synchronized (lock) + synchronized ( lock ) { slf4jLogger.warn( convertFormat(format), arguments ); } @@ -157,7 +156,7 @@ public void log( @Nonnull String format, @Nonnull Object... arguments ) @Override public void bulk( @Nonnull Consumer consumer ) { - synchronized (lock) + synchronized ( lock ) { consumer.accept( this ); } @@ -169,7 +168,7 @@ public void bulk( @Nonnull Consumer consumer ) @Override public void log( @Nonnull String message ) { - synchronized (lock) + synchronized ( lock ) { slf4jLogger.error( message ); } @@ -178,7 +177,7 @@ public void log( @Nonnull String message ) @Override public void log( @Nonnull String message, @Nonnull Throwable throwable ) { - synchronized (lock) + synchronized ( lock ) { slf4jLogger.error( message, throwable ); } @@ -187,7 +186,7 @@ public void log( @Nonnull String message, @Nonnull Throwable throwable ) @Override public void log( @Nonnull String format, @Nonnull Object... arguments ) { - synchronized (lock) + synchronized ( lock ) { slf4jLogger.error( convertFormat(format), arguments ); } @@ -196,7 +195,7 @@ public void log( @Nonnull String format, @Nonnull Object... arguments ) @Override public void bulk( @Nonnull Consumer consumer ) { - synchronized (lock) + synchronized ( lock ) { consumer.accept( this ); } @@ -241,13 +240,13 @@ public Logger errorLogger() @Override public void bulk( @Nonnull Consumer consumer ) { - synchronized (lock) + synchronized ( lock ) { consumer.accept( this ); } } - private String convertFormat(String format) + private String convertFormat( String format ) { return format.replace( "%s", "{}" ); } diff --git a/community/neo4j-slf4j/src/main/java/org/neo4j/logging/slf4j/Slf4jLogProvider.java b/community/neo4j-slf4j/src/main/java/org/neo4j/logging/slf4j/Slf4jLogProvider.java index 93dbdfc93f63e..3f309b0787fb7 100644 --- a/community/neo4j-slf4j/src/main/java/org/neo4j/logging/slf4j/Slf4jLogProvider.java +++ b/community/neo4j-slf4j/src/main/java/org/neo4j/logging/slf4j/Slf4jLogProvider.java @@ -34,7 +34,7 @@ public class Slf4jLogProvider implements LogProvider public Slf4jLogProvider() { - this( LoggerFactory.getILoggerFactory()); + this( LoggerFactory.getILoggerFactory() ); } public Slf4jLogProvider( ILoggerFactory loggerFactory ) diff --git a/community/neo4j/src/test/java/db/DatabaseStartupTest.java b/community/neo4j/src/test/java/db/DatabaseStartupTest.java index 96d0eb6ab02ef..44661734b9b48 100644 --- a/community/neo4j/src/test/java/db/DatabaseStartupTest.java +++ b/community/neo4j/src/test/java/db/DatabaseStartupTest.java @@ -65,7 +65,7 @@ public void startTheDatabaseWithWrongVersionShouldFailWithUpgradeNotAllowed() th try ( FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction(); PageCache pageCache = StandalonePageCacheFactory.createPageCache( fileSystem ) ) { - MetaDataStore.setRecord( pageCache, new File(storeDir, MetaDataStore.DEFAULT_NAME ), + MetaDataStore.setRecord( pageCache, new File( storeDir, MetaDataStore.DEFAULT_NAME ), MetaDataStore.Position.STORE_VERSION, MetaDataStore.versionStringToLong( "bad" )); } @@ -105,7 +105,7 @@ public void startTheDatabaseWithWrongVersionShouldFailAlsoWhenUpgradeIsAllowed() try ( FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction(); PageCache pageCache = StandalonePageCacheFactory.createPageCache( fileSystem ) ) { - MetaDataStore.setRecord( pageCache, new File(storeDir, MetaDataStore.DEFAULT_NAME ), + MetaDataStore.setRecord( pageCache, new File( storeDir, MetaDataStore.DEFAULT_NAME ), MetaDataStore.Position.STORE_VERSION, MetaDataStore.versionStringToLong( badStoreVersion ) ); } diff --git a/community/neo4j/src/test/java/org/neo4j/index/IndexTxStateLookupTest.java b/community/neo4j/src/test/java/org/neo4j/index/IndexTxStateLookupTest.java index 874d9e23281c9..95ce7dffb2e09 100644 --- a/community/neo4j/src/test/java/org/neo4j/index/IndexTxStateLookupTest.java +++ b/community/neo4j/src/test/java/org/neo4j/index/IndexTxStateLookupTest.java @@ -41,14 +41,14 @@ import static org.neo4j.graphdb.Label.label; import static org.neo4j.helpers.collection.Iterators.count; -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class IndexTxStateLookupTest { private static final String TRIGGER_LAZY = "this is supposed to be a really long property to trigger lazy loading"; private static final Random random = new Random(); - @SuppressWarnings("RedundantStringConstructorCall") - @Parameterized.Parameters(name = "store=<{0}> lookup=<{1}>") + @SuppressWarnings( "RedundantStringConstructorCall" ) + @Parameterized.Parameters( name = "store=<{0}> lookup=<{1}>" ) public static Iterable parameters() { List parameters = new ArrayList<>(); diff --git a/community/neo4j/src/test/java/org/neo4j/index/backup/IndexBackupIT.java b/community/neo4j/src/test/java/org/neo4j/index/backup/IndexBackupIT.java index f212cbc45b14a..4b365ccc51683 100644 --- a/community/neo4j/src/test/java/org/neo4j/index/backup/IndexBackupIT.java +++ b/community/neo4j/src/test/java/org/neo4j/index/backup/IndexBackupIT.java @@ -187,7 +187,7 @@ private void updateOldNodes( LongStream idRange ) } } - private String describeFileSets(Set firstFileSet, Set secondFileSet) + private String describeFileSets( Set firstFileSet, Set secondFileSet ) { return "First snapshot files are: " + firstFileSet + System.lineSeparator() + "second snapshot files are: " + secondFileSet; @@ -240,7 +240,7 @@ private void testNodeCreationTransaction( Label label, int i ) } } - private T resolveDependency(Class clazz) + private T resolveDependency( Class clazz ) { return getDatabaseResolver().resolveDependency( clazz ); } diff --git a/community/neo4j/src/test/java/org/neo4j/store/watch/FileWatchIT.java b/community/neo4j/src/test/java/org/neo4j/store/watch/FileWatchIT.java index d58bfcba8086c..79b4fdd7ed06b 100644 --- a/community/neo4j/src/test/java/org/neo4j/store/watch/FileWatchIT.java +++ b/community/neo4j/src/test/java/org/neo4j/store/watch/FileWatchIT.java @@ -86,7 +86,7 @@ public void tearDown() shutdownDatabaseSilently( database ); } - @Test(timeout = TEST_TIMEOUT) + @Test( timeout = TEST_TIMEOUT ) public void notifyAboutStoreFileDeletion() throws Exception { assumeFalse( SystemUtils.IS_OS_WINDOWS ); @@ -111,7 +111,7 @@ public void notifyAboutStoreFileDeletion() throws Exception "'" + fileName + "' which belongs to the store was deleted while database was running." ); } - @Test(timeout = TEST_TIMEOUT) + @Test( timeout = TEST_TIMEOUT ) public void notifyWhenFileWatchingFailToStart() { AssertableLogProvider logProvider = new AssertableLogProvider( true ); @@ -131,7 +131,7 @@ public void notifyWhenFileWatchingFailToStart() } } - @Test(timeout = TEST_TIMEOUT) + @Test( timeout = TEST_TIMEOUT ) public void notifyAboutLegacyIndexFolderRemoval() throws InterruptedException, IOException { String monitoredDirectory = getLegacyIndexDirectory( storeDir ); @@ -157,7 +157,7 @@ public void notifyAboutLegacyIndexFolderRemoval() throws InterruptedException, I "'" + monitoredDirectory + "' which belongs to the store was deleted while database was running." ); } - @Test(timeout = TEST_TIMEOUT) + @Test( timeout = TEST_TIMEOUT ) public void doNotNotifyAboutLuceneIndexFilesDeletion() throws InterruptedException, IOException { DependencyResolver dependencyResolver = ((GraphDatabaseAPI) database).getDependencyResolver(); @@ -196,7 +196,7 @@ public void doNotNotifyAboutLuceneIndexFilesDeletion() throws InterruptedExcepti accumulativeListener.assertDoesNotHaveAnyDeletions(); } - @Test(timeout = TEST_TIMEOUT) + @Test( timeout = TEST_TIMEOUT ) public void doNotMonitorTransactionLogFiles() throws InterruptedException, IOException { assumeFalse( SystemUtils.IS_OS_WINDOWS ); @@ -226,7 +226,7 @@ public void doNotMonitorTransactionLogFiles() throws InterruptedException, IOExc logProvider.assertNone( logMatcher ); } - @Test(timeout = TEST_TIMEOUT) + @Test( timeout = TEST_TIMEOUT ) public void notifyWhenWholeStoreDirectoryRemoved() throws IOException, InterruptedException { assumeFalse( SystemUtils.IS_OS_WINDOWS ); @@ -319,7 +319,7 @@ private void createNode( GraphDatabaseService database, String propertyName, Lab } } - private CheckPointer getCheckpointer(GraphDatabaseService database) + private CheckPointer getCheckpointer( GraphDatabaseService database ) { return ((GraphDatabaseAPI) database).getDependencyResolver().resolveDependency( CheckPointer.class ); } diff --git a/community/neo4j/src/test/java/org/neo4j/tracers/PageCacheCountersIT.java b/community/neo4j/src/test/java/org/neo4j/tracers/PageCacheCountersIT.java index 6ad0b22607752..ef761d150c8bf 100644 --- a/community/neo4j/src/test/java/org/neo4j/tracers/PageCacheCountersIT.java +++ b/community/neo4j/src/test/java/org/neo4j/tracers/PageCacheCountersIT.java @@ -78,7 +78,7 @@ public void tearDown() throws InterruptedException } @Test - @RepeatRule.Repeat( times = 5) + @RepeatRule.Repeat( times = 5 ) public void pageCacheCountersAreSumOfPageCursorCounters() throws Exception { List nodeCreators = new ArrayList<>( numberOfWorkers ); diff --git a/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java b/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java index e4eb00d3236c6..8473fe5d8b338 100644 --- a/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java +++ b/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java @@ -123,7 +123,7 @@ public void shouldRecoverTransactionWhereManyLabelsAreRemovedInTheFuture() throw // GIVEN createIndex( label, "key" ); Label[] labels = new Label[16]; - for (int i = 0; i < labels.length; i++ ) + for ( int i = 0; i < labels.length; i++ ) { labels[i] = label( "Label" + Integer.toHexString( i ) ); } @@ -242,7 +242,7 @@ private void createIndex( Label label, String key ) } } - @Parameterized.Parameters(name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static List flushStrategy() { List parameters = new ArrayList<>( ); @@ -253,7 +253,7 @@ public static List flushStrategy() return parameters; } - @SuppressWarnings("deprecation") + @SuppressWarnings( "deprecation" ) public enum FlushStrategy { FORCE_EVERYTHING @@ -291,7 +291,7 @@ public TestRecoveryScenarios( FlushStrategy flush ) this.flush = flush; } - @SuppressWarnings("deprecation") + @SuppressWarnings( "deprecation" ) @Before public void before() { @@ -335,11 +335,11 @@ private void setProperty( Node node, String key, Object value ) } } - @SuppressWarnings("deprecation") + @SuppressWarnings( "deprecation" ) private void crashAndRestart( InMemoryIndexProvider indexProvider ) throws Exception { final GraphDatabaseService db1 = db; - FileSystemAbstraction uncleanFs = fsRule.snapshot( () -> db1.shutdown() ); + FileSystemAbstraction uncleanFs = fsRule.snapshot( db1::shutdown ); db = (GraphDatabaseAPI) databaseFactory( uncleanFs, indexProvider ).newImpermanentDatabase(); } } diff --git a/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java b/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java index 78edf19073be5..a642dfc9984d9 100644 --- a/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java +++ b/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java @@ -105,7 +105,7 @@ public class MultiIndexPopulationConcurrentUpdatesIT @After public void tearDown() throws Throwable { - if (indexService != null) + if ( indexService != null ) { indexService.shutdown(); } @@ -405,7 +405,7 @@ public StoreScan visitNodes( int[] labelIds labelUpdateVisitor, forceStoreScan ); return new LabelScanViewNodeStoreWrapper( nodeStore, locks, propertyStore, getLabelScanStore(), element -> false, propertyUpdatesVisitor, labelIds, propertyKeyIdFilter, - (LabelScanViewNodeStoreScan) storeScan, updates); + (LabelScanViewNodeStoreScan) storeScan, updates ); } } diff --git a/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java b/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java index 5df617cadb769..363e0d75400b9 100644 --- a/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java +++ b/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java @@ -68,7 +68,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import static org.neo4j.consistency.store.StoreAssertions.assertConsistentStore; import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.kernel.impl.storemigration.MigrationTestUtils.allLegacyStoreFilesHaveVersion; @@ -129,7 +128,7 @@ public void shouldSucceedWithUpgradeAfterPreviousAttemptDiedDuringMigration() new UpgradableDatabase( fs, check, new LegacyStoreVersionCheck( fs ), Standard.LATEST_RECORD_FORMATS ); SilentMigrationProgressMonitor progressMonitor = new SilentMigrationProgressMonitor(); LogService logService = NullLogService.getInstance(); - StoreMigrator failingStoreMigrator = new StoreMigrator(fs, pageCache, CONFIG, logService, schemaIndexProvider ) + StoreMigrator failingStoreMigrator = new StoreMigrator( fs, pageCache, CONFIG, logService, schemaIndexProvider ) { @Override public void migrate( File sourceStoreDir, File targetStoreDir, diff --git a/community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java b/community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java index 6656a34400cd6..93ad92f0a876a 100644 --- a/community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java +++ b/community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java @@ -113,7 +113,7 @@ import static org.neo4j.kernel.impl.storemigration.MigrationTestUtils.truncateFile; import static org.neo4j.kernel.impl.storemigration.MigrationTestUtils.verifyFilesHaveSameContent; -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class StoreUpgraderTest { private final TestDirectory directory = TestDirectory.testDirectory(); @@ -185,7 +185,7 @@ public File[] listFiles( File directory, FilenameFilter filter ) // and a state of the migration saying that it has done the actual migration PageCache pageCache = pageCacheRule.getPageCache( fs ); // remove metadata store record to force tx info lookup in tx logs - MetaDataStore.setRecord( pageCache, new File( storeDirectory, MetaDataStore.DEFAULT_NAME), + MetaDataStore.setRecord( pageCache, new File( storeDirectory, MetaDataStore.DEFAULT_NAME ), MetaDataStore.Position.LAST_TRANSACTION_COMMIT_TIMESTAMP, MetaDataRecordFormat.FIELD_NOT_PRESENT ); UpgradableDatabase upgradableDatabase = new UpgradableDatabase( fs, new StoreVersionCheck( pageCache ), @@ -540,7 +540,7 @@ private void makeDbNotCleanlyShutdown( boolean truncateAll ) throws IOException { Set truncateVersions = versionSet( StandardV2_0.STORE_VERSION, StandardV2_1.STORE_VERSION, StandardV2_2.STORE_VERSION ); - if (truncateVersions.contains( version )) + if ( truncateVersions.contains( version ) ) { if ( truncateAll ) { @@ -574,7 +574,7 @@ protected String getRecordFormatsName() return Standard.LATEST_NAME; } - private Set versionSet(String... versions) + private Set versionSet( String... versions ) { return Stream.of( versions ).collect( Collectors.toSet() ); } diff --git a/community/neo4j/src/test/java/visibility/TestDatasourceCommitOrderDataVisibility.java b/community/neo4j/src/test/java/visibility/TestDatasourceCommitOrderDataVisibility.java index 9bfa671d7e2ab..6db7cf598624f 100644 --- a/community/neo4j/src/test/java/visibility/TestDatasourceCommitOrderDataVisibility.java +++ b/community/neo4j/src/test/java/visibility/TestDatasourceCommitOrderDataVisibility.java @@ -136,7 +136,7 @@ public void run() } } - private void assertNodeIsIndexed(final Node commonNode) throws Exception + private void assertNodeIsIndexed( final Node commonNode ) throws Exception { final Collection problems = new HashSet<>(); diff --git a/community/primitive-collections/src/main/java/org/neo4j/collection/pool/LinkedQueuePool.java b/community/primitive-collections/src/main/java/org/neo4j/collection/pool/LinkedQueuePool.java index 614b849bd8483..6fa902cdcce93 100644 --- a/community/primitive-collections/src/main/java/org/neo4j/collection/pool/LinkedQueuePool.java +++ b/community/primitive-collections/src/main/java/org/neo4j/collection/pool/LinkedQueuePool.java @@ -118,10 +118,10 @@ public boolean shouldCheck() private int currentPeakSize; private int targetSize; - public LinkedQueuePool( int minSize, Factory factory) + public LinkedQueuePool( int minSize, Factory factory ) { this( minSize, factory, new CheckStrategy.TimeoutCheckStrategy( DEFAULT_CHECK_INTERVAL ), - new Monitor.Adapter() ); + new Monitor.Adapter() ); } public LinkedQueuePool( int minSize, Factory factory, CheckStrategy strategy, Monitor monitor ) diff --git a/community/primitive-collections/src/main/java/org/neo4j/collection/pool/MarshlandPool.java b/community/primitive-collections/src/main/java/org/neo4j/collection/pool/MarshlandPool.java index a1c6f4d706225..9ba8c8c331cc9 100644 --- a/community/primitive-collections/src/main/java/org/neo4j/collection/pool/MarshlandPool.java +++ b/community/primitive-collections/src/main/java/org/neo4j/collection/pool/MarshlandPool.java @@ -56,7 +56,7 @@ public class MarshlandPool implements Pool @Override protected LocalSlot initialValue() { - LocalSlot localSlot = new LocalSlot<>(objectsFromDeadThreads); + LocalSlot localSlot = new LocalSlot<>( objectsFromDeadThreads ); slotReferences.add( localSlot.phantomReference ); return localSlot; } @@ -69,7 +69,7 @@ protected LocalSlot initialValue() public MarshlandPool( Factory objectFactory ) { - this(new LinkedQueuePool<>( 4, objectFactory )); + this( new LinkedQueuePool<>( 4, objectFactory ) ); } public MarshlandPool( Pool delegatePool ) @@ -182,7 +182,7 @@ private static class LocalSlot phantomReference = new LocalSlotReference( this, referenceQueue ); } - public void set(T obj) + public void set( T obj ) { phantomReference.object = obj; this.object = obj; diff --git a/community/primitive-collections/src/main/java/org/neo4j/collection/pool/Pool.java b/community/primitive-collections/src/main/java/org/neo4j/collection/pool/Pool.java index e6cdd211a3478..17a13885bd42f 100644 --- a/community/primitive-collections/src/main/java/org/neo4j/collection/pool/Pool.java +++ b/community/primitive-collections/src/main/java/org/neo4j/collection/pool/Pool.java @@ -22,5 +22,6 @@ public interface Pool { T acquire(); - void release(T obj); + + void release( T obj ); } diff --git a/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveIntStack.java b/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveIntStack.java index 00dd46f65f577..52c16b0ccddd7 100644 --- a/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveIntStack.java +++ b/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveIntStack.java @@ -35,7 +35,7 @@ public class PrimitiveIntStack implements PrimitiveIntCollection public PrimitiveIntStack( ) { - this(16); + this( 16 ); } public PrimitiveIntStack( int initialSize ) diff --git a/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveLongCollections.java b/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveLongCollections.java index cd3d6013e733c..7158643bee0b7 100644 --- a/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveLongCollections.java +++ b/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveLongCollections.java @@ -799,7 +799,7 @@ public static List asList( PrimitiveLongIterator iterator ) return out; } - @SuppressWarnings("UnusedDeclaration"/*Useful when debugging in tests, but not used outside of debugging sessions*/) + @SuppressWarnings( "UnusedDeclaration" ) public static Iterator toIterator( final PrimitiveLongIterator primIterator ) { return new Iterator() diff --git a/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/base/Empty.java b/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/base/Empty.java index 2af0cf63f3db7..90168d4daebec 100644 --- a/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/base/Empty.java +++ b/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/base/Empty.java @@ -35,6 +35,11 @@ public class Empty { + @SuppressWarnings( "unchecked" ) + public static final PrimitiveLongObjectMap EMPTY_PRIMITIVE_LONG_OBJECT_MAP = new EmptyPrimitiveLongObjectMap<>(); + public static final PrimitiveIntSet EMPTY_PRIMITIVE_INT_SET = new EmptyPrimitiveIntSet(); + public static final PrimitiveLongCollection EMPTY_PRIMITIVE_LONG_COLLECTION = new EmptyPrimitiveLongCollection(); + public static class EmptyPrimitiveCollection implements PrimitiveCollection { @Override @@ -75,8 +80,6 @@ public void visitKeys( PrimitiveLongVisitor visitor ) } } - public static final PrimitiveLongCollection EMPTY_PRIMITIVE_LONG_COLLECTION = new EmptyPrimitiveLongCollection(); - public static class EmptyPrimitiveLongSet extends EmptyPrimitiveLongCollection implements PrimitiveLongSet { @Override @@ -160,8 +163,6 @@ public boolean remove( int value ) } } - public static final PrimitiveIntSet EMPTY_PRIMITIVE_INT_SET = new EmptyPrimitiveIntSet(); - public static class EmptyPrimitiveLongObjectMap extends EmptyPrimitiveCollection implements PrimitiveLongObjectMap { @Override @@ -204,7 +205,4 @@ public PrimitiveLongIterator iterator() return PrimitiveLongCollections.emptyIterator(); } } - - @SuppressWarnings("unchecked") - public static final PrimitiveLongObjectMap EMPTY_PRIMITIVE_LONG_OBJECT_MAP = new EmptyPrimitiveLongObjectMap<>(); } diff --git a/community/primitive-collections/src/main/java/org/neo4j/concurrent/DecayingFlags.java b/community/primitive-collections/src/main/java/org/neo4j/concurrent/DecayingFlags.java index 3c7a3408406a0..c7746a80502d0 100644 --- a/community/primitive-collections/src/main/java/org/neo4j/concurrent/DecayingFlags.java +++ b/community/primitive-collections/src/main/java/org/neo4j/concurrent/DecayingFlags.java @@ -174,7 +174,7 @@ public String asHex() (bit( i + 6 ) << 1) | (bit( i + 7 )) ) ; } - return printHexBinary(bits); + return printHexBinary( bits ); } private int bit( int idx ) diff --git a/community/primitive-collections/src/test/java/org/neo4j/collection/pool/LinkedQueuePoolTest.java b/community/primitive-collections/src/test/java/org/neo4j/collection/pool/LinkedQueuePoolTest.java index f553f24334879..dd011b6bb3d66 100644 --- a/community/primitive-collections/src/test/java/org/neo4j/collection/pool/LinkedQueuePoolTest.java +++ b/community/primitive-collections/src/test/java/org/neo4j/collection/pool/LinkedQueuePoolTest.java @@ -341,7 +341,7 @@ public void release() private class StatefulMonitor implements LinkedQueuePool.Monitor { - public AtomicInteger currentPeakSize = new AtomicInteger(-1); + public AtomicInteger currentPeakSize = new AtomicInteger( -1 ); public AtomicInteger targetSize = new AtomicInteger( -1 ); public AtomicInteger created = new AtomicInteger( 0 ); public AtomicInteger acquired = new AtomicInteger( 0 ); @@ -388,7 +388,7 @@ public long getAsLong() private long time = 0; - public void forward( long amount, TimeUnit timeUnit) + public void forward( long amount, TimeUnit timeUnit ) { time = time + timeUnit.toMillis( amount ); } diff --git a/community/primitive-collections/src/test/java/org/neo4j/collection/pool/MarshlandPoolTest.java b/community/primitive-collections/src/test/java/org/neo4j/collection/pool/MarshlandPoolTest.java index b83a3b64fe2d3..a7775823bab1c 100644 --- a/community/primitive-collections/src/test/java/org/neo4j/collection/pool/MarshlandPoolTest.java +++ b/community/primitive-collections/src/test/java/org/neo4j/collection/pool/MarshlandPoolTest.java @@ -35,16 +35,16 @@ public class MarshlandPoolTest public void shouldNotLooseObjectsWhenThreadsDie() throws Exception { // Given - Pool delegatePool = mock(Pool.class); - when(delegatePool.acquire()).thenReturn( 1337, -1 ); + Pool delegatePool = mock( Pool.class ); + when( delegatePool.acquire() ).thenReturn( 1337, -1 ); - final MarshlandPool pool = new MarshlandPool<>(delegatePool); + final MarshlandPool pool = new MarshlandPool<>( delegatePool ); // When claimAndReleaseInSeparateThread( pool ); // Then - verify(delegatePool).acquire(); + verify( delegatePool ).acquire(); verifyNoMoreInteractions( delegatePool ); assertPoolEventuallyReturns( pool, 1337 ); } @@ -53,14 +53,14 @@ public void shouldNotLooseObjectsWhenThreadsDie() throws Exception public void shouldReturnToDelegatePoolIfLocalPoolIsFull() throws Exception { // Given - Pool delegatePool = mock(Pool.class); - when(delegatePool.acquire()).thenReturn( 1337 ); + Pool delegatePool = mock( Pool.class ); + when( delegatePool.acquire() ).thenReturn( 1337 ); - final MarshlandPool pool = new MarshlandPool<>(delegatePool); + final MarshlandPool pool = new MarshlandPool<>( delegatePool ); - Object first = pool.acquire(); + Object first = pool.acquire(); Object second = pool.acquire(); - Object third = pool.acquire(); + Object third = pool.acquire(); // When pool.release( first ); @@ -68,8 +68,8 @@ public void shouldReturnToDelegatePoolIfLocalPoolIsFull() throws Exception pool.release( third ); // Then - verify( delegatePool, times(3) ).acquire(); - verify( delegatePool, times(2) ).release( any() ); + verify( delegatePool, times( 3 ) ).acquire(); + verify( delegatePool, times( 2 ) ).release( any() ); verifyNoMoreInteractions( delegatePool ); } @@ -77,20 +77,20 @@ public void shouldReturnToDelegatePoolIfLocalPoolIsFull() throws Exception public void shouldReleaseAllSlotsOnClose() throws Exception { // Given - Pool delegatePool = mock(Pool.class); - when(delegatePool.acquire()).thenReturn( 1337 ); + Pool delegatePool = mock( Pool.class ); + when( delegatePool.acquire() ).thenReturn( 1337 ); - final MarshlandPool pool = new MarshlandPool<>(delegatePool); + final MarshlandPool pool = new MarshlandPool<>( delegatePool ); - Object first = pool.acquire(); + Object first = pool.acquire(); pool.release( first ); // When pool.close(); // Then - verify( delegatePool, times(1) ).acquire(); - verify( delegatePool, times(1) ).release( any() ); + verify( delegatePool, times( 1 ) ).acquire(); + verify( delegatePool, times( 1 ) ).release( any() ); verifyNoMoreInteractions( delegatePool ); } @@ -108,7 +108,7 @@ private void assertPoolEventuallyReturns( Pool pool, int expected ) thro } } - fail("Waited 10 seconds for pool to return object from dead thread, but it was never returned."); + fail( "Waited 10 seconds for pool to return object from dead thread, but it was never returned." ); } private void claimAndReleaseInSeparateThread( final MarshlandPool pool ) throws InterruptedException @@ -121,7 +121,7 @@ public void run() Object obj = pool.acquire(); pool.release( obj ); } - }); + } ); thread.start(); thread.join(); } diff --git a/community/primitive-collections/src/test/java/org/neo4j/concurrent/BinaryLatchTest.java b/community/primitive-collections/src/test/java/org/neo4j/concurrent/BinaryLatchTest.java index 24c27198287fa..ce8f97838012a 100644 --- a/community/primitive-collections/src/test/java/org/neo4j/concurrent/BinaryLatchTest.java +++ b/community/primitive-collections/src/test/java/org/neo4j/concurrent/BinaryLatchTest.java @@ -42,7 +42,7 @@ public static void shutDownExecutor() executor.shutdown(); } - @Test(timeout = 3000) + @Test( timeout = 3000 ) public void releaseThenAwaitDoesNotBlock() throws Exception { BinaryLatch latch = new BinaryLatch(); @@ -50,7 +50,7 @@ public void releaseThenAwaitDoesNotBlock() throws Exception latch.await(); } - @Test(timeout = 3000) + @Test( timeout = 3000 ) public void releaseMustUnblockAwaiters() throws Exception { final BinaryLatch latch = new BinaryLatch(); @@ -87,7 +87,7 @@ public void run() } } - @Test(timeout = 60000) + @Test( timeout = 60000 ) public void stressLatch() throws Exception { final AtomicReference latchRef = new AtomicReference<>( new BinaryLatch() ); diff --git a/community/primitive-collections/src/test/java/org/neo4j/concurrent/RecentKTest.java b/community/primitive-collections/src/test/java/org/neo4j/concurrent/RecentKTest.java index 47d4e010cea87..786b4345d1e8c 100644 --- a/community/primitive-collections/src/test/java/org/neo4j/concurrent/RecentKTest.java +++ b/community/primitive-collections/src/test/java/org/neo4j/concurrent/RecentKTest.java @@ -34,9 +34,9 @@ public class RecentKTest public void shouldEvictOnOverflow() throws Throwable { // When & Then - assertThat( appendSequence( 1, 1, 1, 1, 1, 1, 1 ), yieldsSet( 1 )); - assertThat( appendSequence( 1, 2, 3, 4, 1, 1, 1 ), yieldsSet( 1, 3, 4 )); - assertThat( appendSequence( 1, 1, 1, 2, 2, 6, 4, 4, 1, 1, 2, 2, 2, 5, 5 ), yieldsSet( 1, 2, 5 )); + assertThat( appendSequence( 1, 1, 1, 1, 1, 1, 1 ), yieldsSet( 1 ) ); + assertThat( appendSequence( 1, 2, 3, 4, 1, 1, 1 ), yieldsSet( 1, 3, 4 ) ); + assertThat( appendSequence( 1, 1, 1, 2, 2, 6, 4, 4, 1, 1, 2, 2, 2, 5, 5 ), yieldsSet( 1, 2, 5 ) ); } private Matcher> yieldsSet( final Integer ... expectedItems ) diff --git a/community/security/src/main/java/org/neo4j/server/security/auth/AbstractUserRepository.java b/community/security/src/main/java/org/neo4j/server/security/auth/AbstractUserRepository.java index 5afd85db0f614..878adf0274ecf 100644 --- a/community/security/src/main/java/org/neo4j/server/security/auth/AbstractUserRepository.java +++ b/community/security/src/main/java/org/neo4j/server/security/auth/AbstractUserRepository.java @@ -66,7 +66,7 @@ public void create( User user ) throws InvalidArgumentsException, IOException { assertValidUsername( user.name() ); - synchronized (this) + synchronized ( this ) { // Check for existing user for ( User other : users ) @@ -91,7 +91,7 @@ public void setUsers( ListSnapshot usersSnapshot ) throws InvalidArguments assertValidUsername( user.name() ); } - synchronized (this) + synchronized ( this ) { users.clear(); @@ -118,7 +118,7 @@ public void update( User existingUser, User updatedUser ) "' to '" + updatedUser.name() + "' failed. Changing a roles name is not allowed." ); } - synchronized (this) + synchronized ( this ) { // Copy-on-write for the users list List newUsers = new ArrayList<>(); diff --git a/community/security/src/main/java/org/neo4j/server/security/auth/RateLimitedAuthenticationStrategy.java b/community/security/src/main/java/org/neo4j/server/security/auth/RateLimitedAuthenticationStrategy.java index 9a58e38ea36fc..5d5d83a2f54bd 100644 --- a/community/security/src/main/java/org/neo4j/server/security/auth/RateLimitedAuthenticationStrategy.java +++ b/community/security/src/main/java/org/neo4j/server/security/auth/RateLimitedAuthenticationStrategy.java @@ -68,7 +68,7 @@ public RateLimitedAuthenticationStrategy( Clock clock, int maxFailedAttempts ) } @Override - public AuthenticationResult authenticate( User user, String password) + public AuthenticationResult authenticate( User user, String password ) { AuthenticationMetadata authMetadata = authMetadataFor( user.name() ); diff --git a/community/security/src/main/java/org/neo4j/server/security/auth/UserSerialization.java b/community/security/src/main/java/org/neo4j/server/security/auth/UserSerialization.java index 9b2ae3376c444..a1edf903dae68 100644 --- a/community/security/src/main/java/org/neo4j/server/security/auth/UserSerialization.java +++ b/community/security/src/main/java/org/neo4j/server/security/auth/UserSerialization.java @@ -60,7 +60,7 @@ protected User deserializeRecord( String line, int lineNumber ) throws FormatExc .withName( parts[0] ) .withCredentials( deserializeCredentials( parts[1], lineNumber ) ); - for ( String flag : parts[2].split( ",", -1 )) + for ( String flag : parts[2].split( ",", -1 ) ) { String trimmed = flag.trim(); if ( !trimmed.isEmpty() ) diff --git a/community/security/src/test/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommandIT.java b/community/security/src/test/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommandIT.java index 096241031a615..e289dc0f91e2b 100644 --- a/community/security/src/test/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommandIT.java +++ b/community/security/src/test/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommandIT.java @@ -31,10 +31,10 @@ import org.neo4j.commandline.admin.OutsideWorld; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; +import org.neo4j.kernel.api.security.UserManager; +import org.neo4j.kernel.impl.security.User; import org.neo4j.logging.NullLogProvider; import org.neo4j.server.security.auth.FileUserRepository; -import org.neo4j.kernel.impl.security.User; -import org.neo4j.kernel.api.security.UserManager; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -156,7 +156,7 @@ public void shouldErrorIfRealUsersAlreadyExist() throws Throwable verify( out, times( 0 ) ).stdOutLine( anyString() ); } - private void assertAuthIniFile(String password) throws Throwable + private void assertAuthIniFile( String password ) throws Throwable { File authIniFile = getAuthFile( "auth.ini" ); assertTrue( fileSystem.fileExists( authIniFile ) ); diff --git a/community/security/src/test/java/org/neo4j/server/security/auth/FileUserRepositoryTest.java b/community/security/src/test/java/org/neo4j/server/security/auth/FileUserRepositoryTest.java index 2b3c2537db3b2..e748cf97e8fa0 100644 --- a/community/security/src/test/java/org/neo4j/server/security/auth/FileUserRepositoryTest.java +++ b/community/security/src/test/java/org/neo4j/server/security/auth/FileUserRepositoryTest.java @@ -62,14 +62,14 @@ import static org.junit.Assert.fail; import static org.neo4j.test.assertion.Assert.assertException; -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class FileUserRepositoryTest { private File authFile = new File( "dbms", "auth" ); private LogProvider logProvider = NullLogProvider.getInstance(); private FileSystemAbstraction fs; - @Parameters(name = "{1} filesystem") + @Parameters( name = "{1} filesystem" ) public static Collection data() { return Arrays.asList( new Object[][]{ diff --git a/community/security/src/test/java/org/neo4j/server/security/auth/InitialUserTest.java b/community/security/src/test/java/org/neo4j/server/security/auth/InitialUserTest.java index de43ee96ebec0..539b179524f05 100644 --- a/community/security/src/test/java/org/neo4j/server/security/auth/InitialUserTest.java +++ b/community/security/src/test/java/org/neo4j/server/security/auth/InitialUserTest.java @@ -23,9 +23,9 @@ import org.junit.Test; import org.neo4j.kernel.api.security.AuthManager; +import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.security.Credential; import org.neo4j.kernel.impl.security.User; -import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; @@ -65,7 +65,7 @@ public void shouldLoadInitialUserIfNoneExist() throws Throwable CommunitySecurityModule.getInitialUserRepository( config, NullLogProvider.getInstance(), fsRule.get() ); initialUserRepository.start(); initialUserRepository.create( - new User.Builder( "neo4j", Credential.forPassword( "123" )) + new User.Builder( "neo4j", Credential.forPassword( "123" ) ) .withRequiredPasswordChange( false ) .build() ); @@ -89,7 +89,7 @@ public void shouldLoadInitialUserIfNoneExistEvenWithSamePassword() throws Throwa CommunitySecurityModule.getInitialUserRepository( config, NullLogProvider.getInstance(), fsRule.get() ); initialUserRepository.start(); initialUserRepository.create( - new User.Builder( "neo4j", Credential.forPassword( "neo4j" )) + new User.Builder( "neo4j", Credential.forPassword( "neo4j" ) ) .withRequiredPasswordChange( false ) .build() ); @@ -156,7 +156,7 @@ public void shouldNotUpdateUserIfInitialUserExist() throws Throwable protected User newUser( String userName, String password, boolean pwdChange ) { - return new User.Builder( userName, Credential.forPassword( password )) + return new User.Builder( userName, Credential.forPassword( password ) ) .withRequiredPasswordChange( pwdChange ) .build(); } diff --git a/community/security/src/test/java/org/neo4j/server/security/auth/UserSerializationTest.java b/community/security/src/test/java/org/neo4j/server/security/auth/UserSerializationTest.java index 4468505c7ab61..fd495a5dd57bf 100644 --- a/community/security/src/test/java/org/neo4j/server/security/auth/UserSerializationTest.java +++ b/community/security/src/test/java/org/neo4j/server/security/auth/UserSerializationTest.java @@ -73,12 +73,13 @@ public void shouldReadV1SerializationFormat() throws Exception "Bob:SHA-256,0E1FFFC23E,34A4:password_change_required\n" ) ); // Then - assertThat( deserialized, equalTo( asList( - new User.Builder( "Mike", new Credential( salt1, hash1 )).build(), - new User.Builder( "Steve", new Credential( salt1, hash1 )) - .withRequiredPasswordChange( true ).withFlag("nice_guy").build(), - new User.Builder( "Bob", new Credential( salt2, hash2 )) - .withRequiredPasswordChange( true ).build() + assertThat( deserialized, equalTo( + asList( new User.Builder( "Mike", new Credential( salt1, hash1 ) ).build(), + new User.Builder( "Steve", new Credential( salt1, hash1 ) ) + .withRequiredPasswordChange( true ).withFlag("nice_guy").build(), + new User.Builder( "Bob", new Credential( salt2, hash2 ) ) + .withRequiredPasswordChange( true ) + .build() ) ) ); } } diff --git a/community/security/src/test/java/org/neo4j/server/security/auth/UserTest.java b/community/security/src/test/java/org/neo4j/server/security/auth/UserTest.java index cbf65d0420cff..ef705080c9d2e 100644 --- a/community/security/src/test/java/org/neo4j/server/security/auth/UserTest.java +++ b/community/security/src/test/java/org/neo4j/server/security/auth/UserTest.java @@ -35,8 +35,8 @@ public void shouldBuildImmutableUser() { Credential abc = Credential.forPassword( "123abc" ); Credential fruit = Credential.forPassword( "fruit" ); - User u1 = new User.Builder("Steve", abc).build(); - User u2 = new User.Builder("Steve", fruit) + User u1 = new User.Builder( "Steve", abc ).build(); + User u2 = new User.Builder( "Steve", fruit ) .withRequiredPasswordChange( true ) .withFlag( "nice_guy" ).build(); assertThat( u1, equalTo( u1 ) ); diff --git a/community/server-api/src/main/java/org/neo4j/server/helpers/PropertyTypeDispatcher.java b/community/server-api/src/main/java/org/neo4j/server/helpers/PropertyTypeDispatcher.java index eda4f5151f379..6219426925a38 100644 --- a/community/server-api/src/main/java/org/neo4j/server/helpers/PropertyTypeDispatcher.java +++ b/community/server-api/src/main/java/org/neo4j/server/helpers/PropertyTypeDispatcher.java @@ -240,7 +240,7 @@ protected T dispatchNullProperty( K param ) @SuppressWarnings( "boxing" ) protected abstract T dispatchBooleanProperty( boolean property, K param ); - protected T dispatchOtherProperty( Object property, K param) + protected T dispatchOtherProperty( Object property, K param ) { throw new IllegalArgumentException( "Unsupported property type: " + property.getClass() ); diff --git a/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationFormat.java b/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationFormat.java index 35b7703cd7e72..4ca5c2254c5e5 100644 --- a/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationFormat.java +++ b/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationFormat.java @@ -258,7 +258,7 @@ protected Node getNode( GraphDatabaseAPI graphDb, URI uri ) throws BadInputExcep } catch ( NotFoundException e ) { - throw new NodeNotFoundException(e); + throw new NodeNotFoundException( e ); } } diff --git a/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationType.java b/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationType.java index 786ad5b5258a7..adb23406f0478 100644 --- a/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationType.java +++ b/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationType.java @@ -54,7 +54,7 @@ public final class RepresentationType NODE = new RepresentationType( "node", "nodes", Node.class ), RELATIONSHIP = new RepresentationType( "relationship", "relationships", Relationship.class ), PATH = new RepresentationType( "path", "paths", Path.class ), - FULL_PATH = new RepresentationType( "full-path", "full-paths", FullPath.class), + FULL_PATH = new RepresentationType( "full-path", "full-paths", FullPath.class ), RELATIONSHIP_TYPE = new RepresentationType( "relationship-type", "relationship-types", RelationshipType.class ), PROPERTIES = new RepresentationType( "properties" ), INDEX = new RepresentationType( "index" ), diff --git a/community/server-api/src/main/java/org/neo4j/server/rest/repr/Serializer.java b/community/server-api/src/main/java/org/neo4j/server/rest/repr/Serializer.java index e0f2407fef403..183f86c10e854 100644 --- a/community/server-api/src/main/java/org/neo4j/server/rest/repr/Serializer.java +++ b/community/server-api/src/main/java/org/neo4j/server/rest/repr/Serializer.java @@ -79,7 +79,7 @@ final void serialize( ListWriter list, ListRepresentation value ) list.done(); } - final String relativeUri(String path) + final String relativeUri( String path ) { return joinBaseWithRelativePath(baseUri, path); } @@ -92,7 +92,7 @@ final String relativeTemplate( String path ) static String joinBaseWithRelativePath( URI baseUri, String path ) { String base = baseUri.toString(); - final StringBuilder result = new StringBuilder( base.length() + path.length() + 1).append(base); + final StringBuilder result = new StringBuilder( base.length() + path.length() + 1 ).append( base ); if ( base.endsWith( "/" ) ) { if ( path.startsWith( "/" ) ) diff --git a/community/server-api/src/main/java/org/neo4j/server/rest/repr/ValueRepresentation.java b/community/server-api/src/main/java/org/neo4j/server/rest/repr/ValueRepresentation.java index 652f33893b99d..6e3176036833e 100644 --- a/community/server-api/src/main/java/org/neo4j/server/rest/repr/ValueRepresentation.java +++ b/community/server-api/src/main/java/org/neo4j/server/rest/repr/ValueRepresentation.java @@ -237,9 +237,9 @@ protected Representation dispatchShortArrayProperty( PropertyArray array) + private ListRepresentation toListRepresentation( RepresentationType type, PropertyArray array ) { - return new ListRepresentation(type, dispatch(array) ); + return new ListRepresentation( type, dispatch( array ) ); } @Override diff --git a/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/ExtensionListingFunctionalTest.java b/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/ExtensionListingFunctionalTest.java index 1cc381529a57d..6f13654a56f9d 100644 --- a/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/ExtensionListingFunctionalTest.java +++ b/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/ExtensionListingFunctionalTest.java @@ -59,11 +59,11 @@ public void cleanTheDatabase() @Test public void datarootContainsReferenceToExtensions() throws Exception { - JaxRsResponse response = RestRequest.req().get(functionalTestHelper.dataUri()); - assertThat(response.getStatus(), equalTo( 200 )); - Map json = JsonHelper.jsonToMap( response.getEntity() ); - String extInfo = (String) json.get("extensions_info"); - assertNotNull(new URI(extInfo)); + JaxRsResponse response = RestRequest.req().get( functionalTestHelper.dataUri() ); + assertThat( response.getStatus(), equalTo( 200 ) ); + Map json = JsonHelper.jsonToMap( response.getEntity() ); + String extInfo = (String) json.get( "extensions_info" ); + assertNotNull( new URI( extInfo ) ); response.close(); } diff --git a/community/server/src/main/java/org/neo4j/server/CommunityEntryPoint.java b/community/server/src/main/java/org/neo4j/server/CommunityEntryPoint.java index 13bc84d1e9145..a06804680dfc8 100644 --- a/community/server/src/main/java/org/neo4j/server/CommunityEntryPoint.java +++ b/community/server/src/main/java/org/neo4j/server/CommunityEntryPoint.java @@ -38,7 +38,7 @@ public static void start( String[] args ) System.exit( ServerBootstrapper.start( bootstrapper, args ) ); } - public static void stop( @SuppressWarnings("UnusedParameters") String[] args ) + public static void stop( @SuppressWarnings( "UnusedParameters" ) String[] args ) { if ( bootstrapper != null ) { diff --git a/community/server/src/main/java/org/neo4j/server/ServerCommandLineArgs.java b/community/server/src/main/java/org/neo4j/server/ServerCommandLineArgs.java index 8c775ff33e3da..d60950e8f21bb 100644 --- a/community/server/src/main/java/org/neo4j/server/ServerCommandLineArgs.java +++ b/community/server/src/main/java/org/neo4j/server/ServerCommandLineArgs.java @@ -68,7 +68,7 @@ public Pair[] configOverrides() public Optional configFile() { return Optional.ofNullable( args.get( CONFIG_DIR_ARG ) ) - .map( (dirPath) -> new File( dirPath, ConfigLoader.DEFAULT_CONFIG_FILE_NAME ) ); + .map( ( dirPath ) -> new File( dirPath, ConfigLoader.DEFAULT_CONFIG_FILE_NAME ) ); } private static Pair[] parseConfigOverrides( Args arguments ) diff --git a/community/server/src/main/java/org/neo4j/server/ServerStartupException.java b/community/server/src/main/java/org/neo4j/server/ServerStartupException.java index 8b8c0b856f14f..0124e7e07d8c6 100644 --- a/community/server/src/main/java/org/neo4j/server/ServerStartupException.java +++ b/community/server/src/main/java/org/neo4j/server/ServerStartupException.java @@ -27,7 +27,7 @@ public class ServerStartupException extends RuntimeException { public ServerStartupException( String message, Throwable t ) { - super( message, t); + super( message, t ); } public ServerStartupException( String message ) diff --git a/community/server/src/main/java/org/neo4j/server/configuration/ServerSettings.java b/community/server/src/main/java/org/neo4j/server/configuration/ServerSettings.java index 9e71b154e255c..157f54867d103 100644 --- a/community/server/src/main/java/org/neo4j/server/configuration/ServerSettings.java +++ b/community/server/src/main/java/org/neo4j/server/configuration/ServerSettings.java @@ -28,9 +28,9 @@ import org.neo4j.bolt.BoltKernelExtension; import org.neo4j.configuration.Description; import org.neo4j.configuration.DocumentedDefaultValue; +import org.neo4j.configuration.Internal; import org.neo4j.configuration.LoadableConfig; import org.neo4j.graphdb.config.Setting; -import org.neo4j.configuration.Internal; import org.neo4j.kernel.configuration.Settings; import org.neo4j.server.web.JettyThreadCalculator; @@ -51,20 +51,20 @@ import static org.neo4j.kernel.configuration.Settings.range; import static org.neo4j.kernel.configuration.Settings.setting; -@Description("Settings used by the server configuration") +@Description( "Settings used by the server configuration" ) public class ServerSettings implements LoadableConfig { - @Description("Maximum request header size") + @Description( "Maximum request header size" ) @Internal public static final Setting maximum_request_header_size = setting( "unsupported.dbms.max_http_request_header_size", INTEGER, "20480" ); - @Description("Maximum response header size") + @Description( "Maximum response header size" ) @Internal public static final Setting maximum_response_header_size = setting( "unsupported.dbms.max_http_response_header_size", INTEGER, "20480" ); - @Description("Comma-seperated list of custom security rules for Neo4j to use.") + @Description( "Comma-seperated list of custom security rules for Neo4j to use." ) public static final Setting> security_rules = setting( "dbms.security.http_authorization_classes", STRING_LIST, EMPTY ); @Description( "Number of Neo4j worker threads, your OS might enforce a lower limit than the maximum value " + @@ -84,7 +84,7 @@ public class ServerSettings implements LoadableConfig public static final Setting> console_module_engines = setting( "unsupported.dbms.console_module.engines", STRING_LIST, "SHELL" ); - @Description("Comma-separated list of = for unmanaged extensions.") + @Description( "Comma-separated list of = for unmanaged extensions." ) public static final Setting> third_party_packages = setting( "dbms.unmanaged_extension_classes", new Function>() { @@ -129,51 +129,55 @@ private ThirdPartyJaxRsPackage createThirdPartyJaxRsPackage( String packageAndMo public static final Setting certificates_directory = BoltKernelExtension.Settings.certificates_directory; @Internal - @Description("Path to the X.509 public certificate to be used by Neo4j for TLS connections") + @Description( "Path to the X.509 public certificate to be used by Neo4j for TLS connections" ) public static final Setting tls_certificate_file = BoltKernelExtension.Settings.tls_certificate_file; @Internal - @Description("Path to the X.509 private key to be used by Neo4j for TLS connections") + @Description( "Path to the X.509 private key to be used by Neo4j for TLS connections" ) public static final Setting tls_key_file = BoltKernelExtension.Settings.tls_key_file; - @Description("Enable HTTP request logging.") + @Description( "Enable HTTP request logging." ) public static final Setting http_logging_enabled = setting( "dbms.logs.http.enabled", BOOLEAN, FALSE ); - @Description("Number of HTTP logs to keep.") - public static final Setting http_logging_rotation_keep_number = setting("dbms.logs.http.rotation.keep_number", INTEGER, "5"); + @Description( "Number of HTTP logs to keep." ) + public static final Setting http_logging_rotation_keep_number = + setting( "dbms.logs.http.rotation.keep_number", INTEGER, "5" ); - @Description("Size of each HTTP log that is kept.") - public static final Setting http_logging_rotation_size = setting("dbms.logs.http.rotation.size", BYTES, "20m", min(0L), max( Long.MAX_VALUE ) ); + @Description( "Size of each HTTP log that is kept." ) + public static final Setting http_logging_rotation_size = setting( "dbms.logs.http.rotation.size", BYTES, + "20m", min(0L), max( Long.MAX_VALUE ) ); - @SuppressWarnings("unused") // used only in the startup scripts - @Description("Enable GC Logging") - public static final Setting gc_logging_enabled = setting("dbms.logs.gc.enabled", BOOLEAN, FALSE); + @SuppressWarnings( "unused" ) // used only in the startup scripts + @Description( "Enable GC Logging" ) + public static final Setting gc_logging_enabled = setting( "dbms.logs.gc.enabled", BOOLEAN, FALSE); - @SuppressWarnings("unused") // used only in the startup scripts - @Description("GC Logging Options") - public static final Setting gc_logging_options = setting("dbms.logs.gc.options", STRING, "" + + @SuppressWarnings( "unused" ) // used only in the startup scripts + @Description( "GC Logging Options" ) + public static final Setting gc_logging_options = setting( "dbms.logs.gc.options", STRING, "" + "-XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime " + - "-XX:+PrintPromotionFailure -XX:+PrintTenuringDistribution"); - - @SuppressWarnings("unused") // used only in the startup scripts - @Description("Number of GC logs to keep.") - public static final Setting gc_logging_rotation_keep_number = setting("dbms.logs.gc.rotation.keep_number", INTEGER, "5"); - - @SuppressWarnings("unused") // used only in the startup scripts - @Description("Size of each GC log that is kept.") - public static final Setting gc_logging_rotation_size = setting("dbms.logs.gc.rotation.size", BYTES, "20m", min(0L), max( Long.MAX_VALUE ) ); - - @SuppressWarnings("unused") // used only in the startup scripts - @Description("Path of the run directory. This directory holds Neo4j's runtime state, such as a pidfile when it is" + - " running in the background. The pidfile is created when starting neo4j and removed when stopping it." + - " It may be placed on an in-memory filesystem such as tmpfs.") + "-XX:+PrintPromotionFailure -XX:+PrintTenuringDistribution" ); + + @SuppressWarnings( "unused" ) // used only in the startup scripts + @Description( "Number of GC logs to keep." ) + public static final Setting gc_logging_rotation_keep_number = + setting( "dbms.logs.gc.rotation.keep_number", INTEGER, "5" ); + + @SuppressWarnings( "unused" ) // used only in the startup scripts + @Description( "Size of each GC log that is kept." ) + public static final Setting gc_logging_rotation_size = setting( "dbms.logs.gc.rotation.size", BYTES, + "20m", min(0L), max( Long.MAX_VALUE ) ); + + @SuppressWarnings( "unused" ) // used only in the startup scripts + @Description( "Path of the run directory. This directory holds Neo4j's runtime state, such as a pidfile when it " + + "is running in the background. The pidfile is created when starting neo4j and removed when stopping it." + + " It may be placed on an in-memory filesystem such as tmpfs." ) public static final Setting run_directory = pathSetting( "dbms.directories.run", "run" ); - @SuppressWarnings("unused") // used only in the startup scripts - @Description("Path of the lib directory") + @SuppressWarnings( "unused" ) // used only in the startup scripts + @Description( "Path of the lib directory" ) public static final Setting lib_directory = pathSetting( "dbms.directories.lib", "lib" ); - @Description("Timeout for idle transactions in the REST endpoint.") + @Description( "Timeout for idle transactions in the REST endpoint." ) public static final Setting transaction_idle_timeout = setting( "dbms.rest.transaction.idle_timeout", DURATION, "60s" ); @Internal @@ -187,8 +191,8 @@ private ThirdPartyJaxRsPackage createThirdPartyJaxRsPackage( String packageAndMo public static final Setting browser_path = setting( "unsupported.dbms.uris.browser", Settings.URI, "/browser/" ); @Internal - public static final Setting script_sandboxing_enabled = setting("unsupported.dbms.security.script_sandboxing_enabled", - BOOLEAN, TRUE ); + public static final Setting script_sandboxing_enabled = + setting( "unsupported.dbms.security.script_sandboxing_enabled", BOOLEAN, TRUE ); @Internal public static final Setting wadl_enabled = setting( "unsupported.dbms.wadl_generation_enabled", BOOLEAN, diff --git a/community/server/src/main/java/org/neo4j/server/database/Database.java b/community/server/src/main/java/org/neo4j/server/database/Database.java index 1068d22149ebf..ee05cff5bce32 100644 --- a/community/server/src/main/java/org/neo4j/server/database/Database.java +++ b/community/server/src/main/java/org/neo4j/server/database/Database.java @@ -28,7 +28,7 @@ public interface Database extends Lifecycle { interface Factory { - Database newDatabase( Config config, GraphDatabaseFacadeFactory.Dependencies dependencies); + Database newDatabase( Config config, GraphDatabaseFacadeFactory.Dependencies dependencies ); } String getLocation(); diff --git a/community/server/src/main/java/org/neo4j/server/exception/ServerStartupErrors.java b/community/server/src/main/java/org/neo4j/server/exception/ServerStartupErrors.java index 7c474c3ee7dd7..6ce2c27556235 100644 --- a/community/server/src/main/java/org/neo4j/server/exception/ServerStartupErrors.java +++ b/community/server/src/main/java/org/neo4j/server/exception/ServerStartupErrors.java @@ -59,7 +59,7 @@ public static ServerStartupException translateToServerStartupError( Throwable ca for ( Function translator : translators ) { ServerStartupException r = translator.apply( cause ); - if (r != null) + if ( r != null ) { return r; } diff --git a/community/server/src/main/java/org/neo4j/server/rest/batch/BatchOperations.java b/community/server/src/main/java/org/neo4j/server/rest/batch/BatchOperations.java index 9ddefddad146c..059cb858f5673 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/batch/BatchOperations.java +++ b/community/server/src/main/java/org/neo4j/server/rest/batch/BatchOperations.java @@ -63,23 +63,21 @@ public BatchOperations( WebServer webServer ) protected void addHeaders( final InternalJettyServletRequest res, final HttpHeaders httpHeaders ) { - for (Map.Entry> header : httpHeaders - .getRequestHeaders().entrySet()) + for ( Map.Entry> header : httpHeaders.getRequestHeaders().entrySet() ) { final String key = header.getKey(); final List value = header.getValue(); - if (value == null) + if ( value == null ) { continue; } - if (value.size() != 1) + if ( value.size() != 1 ) { - throw new IllegalArgumentException( - "expecting one value per header"); + throw new IllegalArgumentException( "expecting one value per header" ); } if ( !key.equals( "Accept" ) && !key.equals( "Content-Type" ) ) { - res.addHeader(key, value.get(0)); + res.addHeader( key, value.get( 0 ) ); } } // Make sure they are there and always json @@ -92,18 +90,17 @@ protected URI calculateTargetUri( UriInfo serverUriInfo, String requestedPath ) { URI baseUri = serverUriInfo.getBaseUri(); - if (requestedPath.startsWith(baseUri.toString())) + if ( requestedPath.startsWith( baseUri.toString() ) ) { - requestedPath = requestedPath - .substring( baseUri.toString().length() ); + requestedPath = requestedPath.substring( baseUri.toString().length() ); } - if (!requestedPath.startsWith("/")) + if ( !requestedPath.startsWith( "/" ) ) { requestedPath = "/" + requestedPath; } - return baseUri.resolve("." + requestedPath); + return baseUri.resolve( "." + requestedPath ); } private static final Pattern PLACHOLDER_PATTERN = Pattern.compile( "\\{(\\d{1,10})\\}" ); @@ -156,9 +153,9 @@ protected void parseAndPerform( UriInfo uriInfo, HttpHeaders httpHeaders, HttpSe JsonToken token; RequestData requestData = RequestData.from( req ); - while ((token = jp.nextToken()) != null) + while ( (token = jp.nextToken()) != null ) { - if (token == JsonToken.START_OBJECT) + if ( token == JsonToken.START_OBJECT ) { String jobMethod = "", jobPath = "", jobBody = ""; Integer jobId = null; diff --git a/community/server/src/main/java/org/neo4j/server/rest/batch/NonStreamingBatchOperations.java b/community/server/src/main/java/org/neo4j/server/rest/batch/NonStreamingBatchOperations.java index ca6269812b88b..da7f33ee53c45 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/batch/NonStreamingBatchOperations.java +++ b/community/server/src/main/java/org/neo4j/server/rest/batch/NonStreamingBatchOperations.java @@ -42,7 +42,8 @@ public NonStreamingBatchOperations( WebServer webServer ) super( webServer ); } - public BatchOperationResults performBatchJobs( UriInfo uriInfo, HttpHeaders httpHeaders, HttpServletRequest req, InputStream body ) throws IOException, ServletException + public BatchOperationResults performBatchJobs( UriInfo uriInfo, HttpHeaders httpHeaders, HttpServletRequest req, + InputStream body ) throws IOException, ServletException { results = new BatchOperationResults(); parseAndPerform( uriInfo, httpHeaders, req, body, results.getLocations() ); @@ -50,18 +51,19 @@ public BatchOperationResults performBatchJobs( UriInfo uriInfo, HttpHeaders http } @Override - protected void invoke( String method, String path, String body, Integer id, URI targetUri, InternalJettyServletRequest req, InternalJettyServletResponse res ) throws IOException, ServletException + protected void invoke( String method, String path, String body, Integer id, URI targetUri, + InternalJettyServletRequest req, InternalJettyServletResponse res ) throws IOException, ServletException { - webServer.invokeDirectly(targetUri.getPath(), req, res); + webServer.invokeDirectly( targetUri.getPath(), req, res ); String resultBody = res.getOutputStream().toString(); - if (is2XXStatusCode(res.getStatus())) + if ( is2XXStatusCode( res.getStatus() ) ) { - results.addOperationResult(path, id, resultBody, res.getHeader("Location")); + results.addOperationResult( path, id, resultBody, res.getHeader( "Location" ) ); } else { - throw new BatchOperationFailedException(res.getStatus(), resultBody, null ); + throw new BatchOperationFailedException( res.getStatus(), resultBody, null ); } } diff --git a/community/server/src/main/java/org/neo4j/server/rest/dbms/AuthorizationFilter.java b/community/server/src/main/java/org/neo4j/server/rest/dbms/AuthorizationFilter.java index 8dbd6432c340f..12ba6ad3e7798 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/dbms/AuthorizationFilter.java +++ b/community/server/src/main/java/org/neo4j/server/rest/dbms/AuthorizationFilter.java @@ -42,7 +42,7 @@ public abstract class AuthorizationFilter implements Filter { protected static ThrowingConsumer error( int code, Object body ) { - return (response) -> + return ( response ) -> { response.setStatus( code ); response.addHeader( HttpHeaders.CONTENT_TYPE, "application/json; charset=UTF-8" ); diff --git a/community/server/src/main/java/org/neo4j/server/rest/dbms/UserService.java b/community/server/src/main/java/org/neo4j/server/rest/dbms/UserService.java index 3ba27c2b40328..1bdb6b68a5e7c 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/dbms/UserService.java +++ b/community/server/src/main/java/org/neo4j/server/rest/dbms/UserService.java @@ -47,7 +47,7 @@ import static org.neo4j.server.rest.dbms.AuthorizedRequestWrapper.getSecurityContextFromUserPrincipal; import static org.neo4j.server.rest.web.CustomStatusType.UNPROCESSABLE; -@Path("/user") +@Path( "/user" ) public class UserService { public static final String PASSWORD = "password"; @@ -65,8 +65,8 @@ public UserService( @Context UserManagerSupplier userManagerSupplier, @Context I } @GET - @Path("/{username}") - public Response getUser( @PathParam("username") String username, @Context HttpServletRequest req ) + @Path( "/{username}" ) + public Response getUser( @PathParam( "username" ) String username, @Context HttpServletRequest req ) { Principal principal = req.getUserPrincipal(); if ( principal == null || !principal.getName().equals( username ) ) @@ -89,8 +89,9 @@ public Response getUser( @PathParam("username") String username, @Context HttpSe } @POST - @Path("/{username}/password") - public Response setPassword( @PathParam("username") String username, @Context HttpServletRequest req, String payload ) + @Path( "/{username}/password" ) + public Response setPassword( @PathParam( "username" ) String username, @Context HttpServletRequest req, + String payload ) { Principal principal = req.getUserPrincipal(); if ( principal == null || !principal.getName().equals( username ) ) diff --git a/community/server/src/main/java/org/neo4j/server/rest/domain/EvaluatorFactory.java b/community/server/src/main/java/org/neo4j/server/rest/domain/EvaluatorFactory.java index 41e2a39deb5ca..747ce0ecb499b 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/domain/EvaluatorFactory.java +++ b/community/server/src/main/java/org/neo4j/server/rest/domain/EvaluatorFactory.java @@ -126,14 +126,14 @@ else if ( name.equalsIgnoreCase( "all_but_start_node" ) ) private abstract static class ScriptedEvaluator { private final ScriptExecutor executor; - private final Map scriptContext = new HashMap<>(1); + private final Map scriptContext = new HashMap<>( 1 ); ScriptedEvaluator( ScriptExecutor executor ) { this.executor = executor; } - protected boolean evalPosition(Path path) + protected boolean evalPosition( Path path ) { scriptContext.put( "position", path ); @@ -144,7 +144,7 @@ protected boolean evalPosition(Path path) return (Boolean) out; } - throw new EvaluationException("Provided script did not return a boolean value."); + throw new EvaluationException( "Provided script did not return a boolean value." ); } } diff --git a/community/server/src/main/java/org/neo4j/server/rest/domain/JsonHelper.java b/community/server/src/main/java/org/neo4j/server/rest/domain/JsonHelper.java index 349d4694f06b9..1927265a9a0f1 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/domain/JsonHelper.java +++ b/community/server/src/main/java/org/neo4j/server/rest/domain/JsonHelper.java @@ -19,24 +19,24 @@ */ package org.neo4j.server.rest.domain; +import org.codehaus.jackson.JsonGenerator; +import org.codehaus.jackson.JsonLocation; +import org.codehaus.jackson.JsonNode; +import org.codehaus.jackson.map.ObjectMapper; + import java.io.IOException; import java.io.StringWriter; import java.util.Collection; import java.util.List; import java.util.Map; -import org.codehaus.jackson.JsonGenerator; -import org.codehaus.jackson.JsonLocation; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; - import org.neo4j.server.rest.web.PropertyValueException; public class JsonHelper { static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); - public static JsonNode jsonNode(String json) throws JsonParseException + public static JsonNode jsonNode( String json ) throws JsonParseException { try { diff --git a/community/server/src/main/java/org/neo4j/server/rest/domain/PropertySettingStrategy.java b/community/server/src/main/java/org/neo4j/server/rest/domain/PropertySettingStrategy.java index 33f8e36e742af..82cff3de1f04d 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/domain/PropertySettingStrategy.java +++ b/community/server/src/main/java/org/neo4j/server/rest/domain/PropertySettingStrategy.java @@ -92,7 +92,7 @@ public void setProperties( PropertyContainer entity, Map propert } } - public void setProperty(PropertyContainer entity, String key, Object value) throws PropertyValueException + public void setProperty( PropertyContainer entity, String key, Object value ) throws PropertyValueException { if ( value instanceof Collection ) { @@ -114,8 +114,7 @@ public void setProperty(PropertyContainer entity, String key, Object value) thro } else { - throw new PropertyValueException( - "Unable to set property '" + key + "' to an empty array, " + + throw new PropertyValueException( "Unable to set property '" + key + "' to an empty array, " + "because, since there are no values of any type in it, " + "and no pre-existing collection to infer type from, it is not possible " + "to determine what type of array to store." ); diff --git a/community/server/src/main/java/org/neo4j/server/rest/management/JmxService.java b/community/server/src/main/java/org/neo4j/server/rest/management/JmxService.java index 732c3da9e2fca..cb7a6e29f6879 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/management/JmxService.java +++ b/community/server/src/main/java/org/neo4j/server/rest/management/JmxService.java @@ -25,7 +25,6 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; - import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; @@ -46,14 +45,14 @@ import org.neo4j.server.database.Database; import org.neo4j.server.rest.domain.JsonHelper; import org.neo4j.server.rest.domain.JsonParseException; -import org.neo4j.server.rest.repr.InputFormat; -import org.neo4j.server.rest.repr.ListRepresentation; -import org.neo4j.server.rest.repr.OutputFormat; import org.neo4j.server.rest.management.repr.JmxDomainRepresentation; import org.neo4j.server.rest.management.repr.JmxMBeanRepresentation; import org.neo4j.server.rest.management.repr.ServiceDefinitionRepresentation; +import org.neo4j.server.rest.repr.InputFormat; +import org.neo4j.server.rest.repr.ListRepresentation; +import org.neo4j.server.rest.repr.OutputFormat; -@Path(JmxService.ROOT_PATH) +@Path( JmxService.ROOT_PATH ) public class JmxService implements AdvertisableService { public static final String ROOT_PATH = "server/jmx"; @@ -84,7 +83,7 @@ public Response getServiceDefinition() } @GET - @Path(DOMAINS_PATH) + @Path( DOMAINS_PATH ) public Response listDomains() throws NullPointerException { MBeanServer server = ManagementFactory.getPlatformMBeanServer(); @@ -93,8 +92,8 @@ public Response listDomains() throws NullPointerException } @GET - @Path(DOMAIN_TEMPLATE) - public Response getDomain( @PathParam("domain") String domainName ) + @Path( DOMAIN_TEMPLATE ) + public Response getDomain( @PathParam( "domain" ) String domainName ) { MBeanServer server = ManagementFactory.getPlatformMBeanServer(); @@ -113,8 +112,8 @@ public Response getDomain( @PathParam("domain") String domainName ) } @GET - @Path(BEAN_TEMPLATE) - public Response getBean( @PathParam("domain") String domainName, @PathParam("objectName") String objectName ) + @Path( BEAN_TEMPLATE ) + public Response getBean( @PathParam( "domain" ) String domainName, @PathParam( "objectName" ) String objectName ) { MBeanServer server = ManagementFactory.getPlatformMBeanServer(); @@ -140,9 +139,9 @@ private ObjectName createObjectName( final String domainName, final String objec } @POST - @Consumes(MediaType.APPLICATION_JSON) - @Path(QUERY_PATH) - @SuppressWarnings("unchecked") + @Consumes( MediaType.APPLICATION_JSON ) + @Path( QUERY_PATH ) + @SuppressWarnings( "unchecked" ) public Response queryBeans( String query ) { try @@ -175,17 +174,17 @@ public Response queryBeans( String query ) } @POST - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_FORM_URLENCODED) - @Path(QUERY_PATH) - public Response formQueryBeans( @FormParam("value") String data ) + @Produces( MediaType.APPLICATION_JSON ) + @Consumes( MediaType.APPLICATION_FORM_URLENCODED ) + @Path( QUERY_PATH ) + public Response formQueryBeans( @FormParam( "value" ) String data ) { return queryBeans( data ); } @GET - @Produces(MediaType.APPLICATION_JSON) - @Path(KERNEL_NAME_PATH) + @Produces( MediaType.APPLICATION_JSON ) + @Path( KERNEL_NAME_PATH ) public Response currentKernelInstance( @Context Database database ) { Kernel kernelBean = database.getGraph().getDependencyResolver().resolveDependency( JmxKernelExtension.class ) diff --git a/community/server/src/main/java/org/neo4j/server/rest/management/RootService.java b/community/server/src/main/java/org/neo4j/server/rest/management/RootService.java index 86e1423010427..594f703c74b66 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/management/RootService.java +++ b/community/server/src/main/java/org/neo4j/server/rest/management/RootService.java @@ -26,10 +26,10 @@ import javax.ws.rs.core.UriInfo; import org.neo4j.server.NeoServer; -import org.neo4j.server.rest.repr.OutputFormat; import org.neo4j.server.rest.management.repr.ServerRootRepresentation; +import org.neo4j.server.rest.repr.OutputFormat; -@Path("/") +@Path( "/" ) public class RootService { private final NeoServer neoServer; diff --git a/community/server/src/main/java/org/neo4j/server/rest/management/VersionAndEditionService.java b/community/server/src/main/java/org/neo4j/server/rest/management/VersionAndEditionService.java index f72a94635c291..75e913f31fbd1 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/management/VersionAndEditionService.java +++ b/community/server/src/main/java/org/neo4j/server/rest/management/VersionAndEditionService.java @@ -32,7 +32,7 @@ import static org.neo4j.helpers.collection.MapUtil.map; import static org.neo4j.server.rest.domain.JsonHelper.createJsonFrom; -@Path(VersionAndEditionService.SERVER_PATH) +@Path( VersionAndEditionService.SERVER_PATH ) public class VersionAndEditionService implements AdvertisableService { private NeoServer neoServer; @@ -56,7 +56,7 @@ public String getServerPath() } @GET - @Produces(APPLICATION_JSON) + @Produces( APPLICATION_JSON ) public Response getVersionAndEditionData() { return Response.ok( createJsonFrom( map( diff --git a/community/server/src/main/java/org/neo4j/server/rest/management/console/ConsoleService.java b/community/server/src/main/java/org/neo4j/server/rest/management/console/ConsoleService.java index 1c4c4361f3882..c4874e7009809 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/management/console/ConsoleService.java +++ b/community/server/src/main/java/org/neo4j/server/rest/management/console/ConsoleService.java @@ -136,11 +136,12 @@ public Response exec( @Context InputFormat input, String data ) return output.ok( new ListRepresentation( RepresentationType.STRING, list ) ); } - catch (Exception e) + catch ( Exception e ) { List list = new ArrayList( - asList( ValueRepresentation.string( e.getClass() + " : " + e.getMessage() + "\n"), ValueRepresentation.string( null ) )); - return output.ok(new ListRepresentation( RepresentationType.STRING, list )); + asList( ValueRepresentation.string( e.getClass() + " : " + e.getMessage() + "\n" ), + ValueRepresentation.string( null ) ) ); + return output.ok( new ListRepresentation( RepresentationType.STRING, list ) ); } } diff --git a/community/server/src/main/java/org/neo4j/server/rest/management/repr/ConsoleServiceRepresentation.java b/community/server/src/main/java/org/neo4j/server/rest/management/repr/ConsoleServiceRepresentation.java index 66cd710c4d774..d6782ddbec8de 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/management/repr/ConsoleServiceRepresentation.java +++ b/community/server/src/main/java/org/neo4j/server/rest/management/repr/ConsoleServiceRepresentation.java @@ -27,9 +27,9 @@ public class ConsoleServiceRepresentation extends ServiceDefinitionRepresentatio private Iterable engines; - public ConsoleServiceRepresentation(String basePath, Iterable engines) + public ConsoleServiceRepresentation( String basePath, Iterable engines ) { - super(basePath); + super( basePath ); resourceUri( "exec", "" ); this.engines = engines; } @@ -37,8 +37,8 @@ public ConsoleServiceRepresentation(String basePath, Iterable engines) @Override public void serialize( MappingSerializer serializer ) { - super.serialize(serializer); - serializer.putList("engines", ListRepresentation.string(engines)); + super.serialize( serializer ); + serializer.putList( "engines", ListRepresentation.string( engines ) ); } } diff --git a/community/server/src/main/java/org/neo4j/server/rest/paging/LeaseManagerProvider.java b/community/server/src/main/java/org/neo4j/server/rest/paging/LeaseManagerProvider.java index 511d687f3d63e..a91b733970cfe 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/paging/LeaseManagerProvider.java +++ b/community/server/src/main/java/org/neo4j/server/rest/paging/LeaseManagerProvider.java @@ -19,18 +19,18 @@ */ package org.neo4j.server.rest.paging; +import com.sun.jersey.api.core.HttpContext; + import javax.ws.rs.ext.Provider; import org.neo4j.server.database.InjectableProvider; -import com.sun.jersey.api.core.HttpContext; - @Provider public class LeaseManagerProvider extends InjectableProvider { private final LeaseManager leaseManager; - public LeaseManagerProvider(LeaseManager leaseManager) + public LeaseManagerProvider( LeaseManager leaseManager ) { super( LeaseManager.class ); this.leaseManager = leaseManager; diff --git a/community/server/src/main/java/org/neo4j/server/rest/repr/CypherResultRepresentation.java b/community/server/src/main/java/org/neo4j/server/rest/repr/CypherResultRepresentation.java index 9fc07e95e2063..864123bfdd5e1 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/repr/CypherResultRepresentation.java +++ b/community/server/src/main/java/org/neo4j/server/rest/repr/CypherResultRepresentation.java @@ -71,24 +71,23 @@ private ListRepresentation createResultRepresentation( Result executionResult ) { final List columns = executionResult.columns(); Iterable> inner = new RepresentationExceptionHandlingIterable<>( loop( executionResult ) ); - return new ListRepresentation( "data", new IterableWrapper>(inner) + return new ListRepresentation( "data", new IterableWrapper>( inner ) { @Override - protected Representation underlyingObjectToObject(final Map row) + protected Representation underlyingObjectToObject( final Map row ) { - return new ListRepresentation("row", - new IterableWrapper(columns) - { - - @Override - protected Representation underlyingObjectToObject(String column) - { - return getRepresentation( row.get( column ) ); - } - }); + return new ListRepresentation( "row", new IterableWrapper( columns ) + { + + @Override + protected Representation underlyingObjectToObject( String column ) + { + return getRepresentation( row.get( column ) ); + } + } ); } - }); + } ); } private Representation getRepresentation( Object r ) @@ -100,7 +99,7 @@ private Representation getRepresentation( Object r ) if ( r instanceof Path ) { - return new PathRepresentation<>((Path) r ); + return new PathRepresentation<>( (Path) r ); } if ( r instanceof Iterable ) @@ -108,12 +107,12 @@ private Representation getRepresentation( Object r ) return handleIterable( (Iterable) r ); } - if ( r instanceof Node) + if ( r instanceof Node ) { return new NodeRepresentation( (Node) r ); } - if ( r instanceof Relationship) + if ( r instanceof Relationship ) { return new RelationshipRepresentation( (Relationship) r ); } diff --git a/community/server/src/main/java/org/neo4j/server/rest/repr/MapRepresentation.java b/community/server/src/main/java/org/neo4j/server/rest/repr/MapRepresentation.java index 40373b4514d72..2d4dc2fb0b3f4 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/repr/MapRepresentation.java +++ b/community/server/src/main/java/org/neo4j/server/rest/repr/MapRepresentation.java @@ -59,7 +59,7 @@ else if ( val instanceof String ) { serializer.putString( keyString, (String) val ); } - else if (val instanceof Path ) + else if ( val instanceof Path ) { PathRepresentation representation = new PathRepresentation<>( (Path) val ); serializer.putMapping( keyString, representation ); @@ -74,17 +74,17 @@ else if ( val instanceof Map ) serializer.putMapping( keyString, ObjectToRepresentationConverter.getMapRepresentation( (Map) val ) ); } - else if (val == null) + else if ( val == null ) { serializer.putString( keyString, null ); } - else if (val.getClass().isArray()) + else if ( val.getClass().isArray() ) { Object[] objects = toArray( val ); serializer.putList( keyString, ObjectToRepresentationConverter.getListRepresentation( asList(objects) ) ); } - else if (val instanceof Node || val instanceof Relationship ) + else if ( val instanceof Node || val instanceof Relationship ) { Representation representation = ObjectToRepresentationConverter.getSingleRepresentation( val ); serializer.putMapping( keyString, (MappingRepresentation) representation ); diff --git a/community/server/src/main/java/org/neo4j/server/rest/repr/NodeAutoIndexRepresentation.java b/community/server/src/main/java/org/neo4j/server/rest/repr/NodeAutoIndexRepresentation.java index 9133a6cefbefd..0f1e3ff4dfd09 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/repr/NodeAutoIndexRepresentation.java +++ b/community/server/src/main/java/org/neo4j/server/rest/repr/NodeAutoIndexRepresentation.java @@ -28,7 +28,7 @@ public class NodeAutoIndexRepresentation extends IndexRepresentation public NodeAutoIndexRepresentation() { - super("", Collections.EMPTY_MAP); + super( "", Collections.EMPTY_MAP ); } @Override diff --git a/community/server/src/main/java/org/neo4j/server/rest/repr/ObjectToRepresentationConverter.java b/community/server/src/main/java/org/neo4j/server/rest/repr/ObjectToRepresentationConverter.java index ba68f81fbdde3..e1fe19acbafb4 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/repr/ObjectToRepresentationConverter.java +++ b/community/server/src/main/java/org/neo4j/server/rest/repr/ObjectToRepresentationConverter.java @@ -56,25 +56,27 @@ public static MappingRepresentation getMapRepresentation( Map data ) return new MapRepresentation( data ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) static Representation getIteratorRepresentation( Iterator data ) { - final FirstItemIterable results = new FirstItemIterable<>(new IteratorWrapper(data) - { - @Override - protected Representation underlyingObjectToObject( Object value ) - { - if ( value instanceof Iterable ) - { - FirstItemIterable nested = convertValuesToRepresentations( (Iterable) value ); - return new ListRepresentation( getType( nested ), nested ); - } - else + final FirstItemIterable results = + new FirstItemIterable<>( new IteratorWrapper( data ) { - return getSingleRepresentation( value ); - } - } - }); + @Override + protected Representation underlyingObjectToObject( Object value ) + { + if ( value instanceof Iterable ) + { + FirstItemIterable nested = + convertValuesToRepresentations( (Iterable) value ); + return new ListRepresentation( getType( nested ), nested ); + } + else + { + return getSingleRepresentation( value ); + } + } + } ); return new ListRepresentation( getType( results ), results ); } @@ -84,17 +86,17 @@ public static ListRepresentation getListRepresentation( Iterable data ) return new ServerListRepresentation( getType( results ), results ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) static FirstItemIterable convertValuesToRepresentations( Iterable data ) { - return new FirstItemIterable<>(new IterableWrapper( data ) + return new FirstItemIterable<>( new IterableWrapper( data ) { @Override protected Representation underlyingObjectToObject( Object value ) { return convert( value ); } - }); + } ); } static RepresentationType getType( FirstItemIterable representations ) diff --git a/community/server/src/main/java/org/neo4j/server/rest/repr/RelationshipAutoIndexRepresentation.java b/community/server/src/main/java/org/neo4j/server/rest/repr/RelationshipAutoIndexRepresentation.java index 36e84f672f383..3d217bb11c4e2 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/repr/RelationshipAutoIndexRepresentation.java +++ b/community/server/src/main/java/org/neo4j/server/rest/repr/RelationshipAutoIndexRepresentation.java @@ -28,7 +28,7 @@ public class RelationshipAutoIndexRepresentation extends IndexRepresentation public RelationshipAutoIndexRepresentation() { - super("", Collections.EMPTY_MAP); + super( "", Collections.EMPTY_MAP ); } @Override diff --git a/community/server/src/main/java/org/neo4j/server/rest/repr/RepresentationFormatRepository.java b/community/server/src/main/java/org/neo4j/server/rest/repr/RepresentationFormatRepository.java index 5ca4ff45a1a0f..fb0deee513c58 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/repr/RepresentationFormatRepository.java +++ b/community/server/src/main/java/org/neo4j/server/rest/repr/RepresentationFormatRepository.java @@ -46,7 +46,8 @@ public RepresentationFormatRepository( AbstractNeoServer injectorProvider ) } } - public OutputFormat outputFormat(List acceptable, URI baseUri, MultivaluedMap requestHeaders) + public OutputFormat outputFormat( List acceptable, URI baseUri, + MultivaluedMap requestHeaders ) { RepresentationFormat format = forHeaders( acceptable, requestHeaders ); if ( format == null ) @@ -65,7 +66,7 @@ private PluginManager getExtensionManager() return injectorProvider == null ? null : injectorProvider.getExtensionManager(); } - private RepresentationFormat forHeaders(List acceptable, MultivaluedMap requestHeaders) + private RepresentationFormat forHeaders( List acceptable, MultivaluedMap requestHeaders ) { if ( requestHeaders == null ) { @@ -83,9 +84,9 @@ private RepresentationFormat forHeaders(List acceptable, MultivaluedM return null; } - private boolean containsType(List mediaTypes, MediaType mediaType) + private boolean containsType( List mediaTypes, MediaType mediaType ) { - for (MediaType type : mediaTypes) + for ( MediaType type : mediaTypes ) { if ( mediaType.getType().equals( type.getType() ) && mediaType.getSubtype().equals( type.getSubtype() ) ) { @@ -95,7 +96,7 @@ private boolean containsType(List mediaTypes, MediaType mediaType) return false; } - private RepresentationFormat forMediaTypes(List acceptable) + private RepresentationFormat forMediaTypes( List acceptable ) { for ( MediaType type : acceptable ) { diff --git a/community/server/src/main/java/org/neo4j/server/rest/repr/StreamingFormat.java b/community/server/src/main/java/org/neo4j/server/rest/repr/StreamingFormat.java index 9c1cab899ca29..b443da5f62c33 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/repr/StreamingFormat.java +++ b/community/server/src/main/java/org/neo4j/server/rest/repr/StreamingFormat.java @@ -32,5 +32,5 @@ public interface StreamingFormat MediaType MEDIA_TYPE = new MediaType( APPLICATION_JSON_TYPE.getType(), APPLICATION_JSON_TYPE.getSubtype(), MapUtil.stringMap("stream", "true", "charset", "UTF-8") ); - RepresentationFormat writeTo(OutputStream output); + RepresentationFormat writeTo( OutputStream output ); } diff --git a/community/server/src/main/java/org/neo4j/server/rest/repr/formats/StreamingJsonFormat.java b/community/server/src/main/java/org/neo4j/server/rest/repr/formats/StreamingJsonFormat.java index 6b37073b1ec65..de6e6ccbda593 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/repr/formats/StreamingJsonFormat.java +++ b/community/server/src/main/java/org/neo4j/server/rest/repr/formats/StreamingJsonFormat.java @@ -49,7 +49,7 @@ import static org.neo4j.server.rest.domain.JsonHelper.assertSupportedPropertyValue; import static org.neo4j.server.rest.domain.JsonHelper.readJson; -@Service.Implementation(RepresentationFormat.class) +@Service.Implementation( RepresentationFormat.class ) public class StreamingJsonFormat extends RepresentationFormat implements StreamingFormat { diff --git a/community/server/src/main/java/org/neo4j/server/rest/repr/util/RFC1123.java b/community/server/src/main/java/org/neo4j/server/rest/repr/util/RFC1123.java index 2f017789346b7..7a3fafc5347fb 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/repr/util/RFC1123.java +++ b/community/server/src/main/java/org/neo4j/server/rest/repr/util/RFC1123.java @@ -51,13 +51,13 @@ private RFC1123() format.setTimeZone( GMT ); } - public Date parse(String input) throws ParseException + public Date parse( String input ) throws ParseException { format.set2DigitYearStart( Y2K_START_DATE ); return format.parse( input ); } - public String format(Date date) + public String format( Date date ) { if ( null == date ) { @@ -78,12 +78,12 @@ static RFC1123 instance() return instance; } - public static Date parseTimestamp(String input) throws ParseException + public static Date parseTimestamp( String input ) throws ParseException { return instance().parse( input ); } - public static String formatDate(Date date) + public static String formatDate( Date date ) { return instance().format( date ); } diff --git a/community/server/src/main/java/org/neo4j/server/rest/security/ForbiddingSecurityRule.java b/community/server/src/main/java/org/neo4j/server/rest/security/ForbiddingSecurityRule.java index dfcdfc8e2426a..819e2552bae0b 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/security/ForbiddingSecurityRule.java +++ b/community/server/src/main/java/org/neo4j/server/rest/security/ForbiddingSecurityRule.java @@ -33,6 +33,6 @@ public interface ForbiddingSecurityRule extends SecurityRule * @return true if the rule is triggered and the request is to be rejected with a "403 Forbidden", * and false otherwise. */ - boolean isForbidden(HttpServletRequest request); + boolean isForbidden( HttpServletRequest request ); } diff --git a/community/server/src/main/java/org/neo4j/server/rest/security/SecurityRule.java b/community/server/src/main/java/org/neo4j/server/rest/security/SecurityRule.java index 40c64c9199c96..d53e16cba0b54 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/security/SecurityRule.java +++ b/community/server/src/main/java/org/neo4j/server/rest/security/SecurityRule.java @@ -28,7 +28,7 @@ public interface SecurityRule * @return true if the rule passes, false if the * rule fails and the request is to be rejected with a "401 Unauthorized". */ - boolean isAuthorized(HttpServletRequest request); + boolean isAuthorized( HttpServletRequest request ); /** * @return the root of the URI path from which rules will be valid, e.g. diff --git a/community/server/src/main/java/org/neo4j/server/rest/security/UriPathWildcardMatcher.java b/community/server/src/main/java/org/neo4j/server/rest/security/UriPathWildcardMatcher.java index 49ba6b7c13c1d..5a5a1d39ce3dd 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/security/UriPathWildcardMatcher.java +++ b/community/server/src/main/java/org/neo4j/server/rest/security/UriPathWildcardMatcher.java @@ -23,13 +23,13 @@ public class UriPathWildcardMatcher { private final String uriPath; - public UriPathWildcardMatcher(String uriPath) + public UriPathWildcardMatcher( String uriPath ) { - this.uriPath = uriPath.replace("*", ".*"); + this.uriPath = uriPath.replace( "*", ".*" ); } - public boolean matches(String uri) + public boolean matches( String uri ) { - return uri.matches(uriPath); + return uri.matches( uriPath ); } } diff --git a/community/server/src/main/java/org/neo4j/server/rest/transactional/ExecutionResultSerializer.java b/community/server/src/main/java/org/neo4j/server/rest/transactional/ExecutionResultSerializer.java index badb54d4dc6fe..857acb546ddd2 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/transactional/ExecutionResultSerializer.java +++ b/community/server/src/main/java/org/neo4j/server/rest/transactional/ExecutionResultSerializer.java @@ -251,7 +251,7 @@ private void writePlanDescriptionObjectBody( ExecutionPlanDescription planDescri out.writeArrayFieldStart( "children" ); try { - for (ExecutionPlanDescription child : children ) + for ( ExecutionPlanDescription child : children ) { out.writeStartObject(); try diff --git a/community/server/src/main/java/org/neo4j/server/rest/transactional/Neo4jJsonCodec.java b/community/server/src/main/java/org/neo4j/server/rest/transactional/Neo4jJsonCodec.java index 39bdeb2c8258c..ef2a09dda3205 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/transactional/Neo4jJsonCodec.java +++ b/community/server/src/main/java/org/neo4j/server/rest/transactional/Neo4jJsonCodec.java @@ -66,7 +66,7 @@ else if ( value instanceof Path ) { writePath( out, ((Path) value).iterator(), TransactionStateChecker.create( container ) ); } - else if (value instanceof Iterable) + else if ( value instanceof Iterable ) { writeIterator( out, ((Iterable) value).iterator() ); } diff --git a/community/server/src/main/java/org/neo4j/server/rest/transactional/StatementDeserializer.java b/community/server/src/main/java/org/neo4j/server/rest/transactional/StatementDeserializer.java index c25271d73cfd3..fc843f896182d 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/transactional/StatementDeserializer.java +++ b/community/server/src/main/java/org/neo4j/server/rest/transactional/StatementDeserializer.java @@ -165,7 +165,7 @@ protected Statement fetchNextOrNull() addError( new Neo4jError( Status.Network.CommunicationError, e ) ); return null; } - catch ( Exception e) + catch ( Exception e ) { addError( new Neo4jError( Status.General.UnknownError, e ) ); return null; @@ -178,13 +178,13 @@ private void discardValue( JsonParser input ) throws IOException input.readValueAs( Object.class ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private static Map readMap( JsonParser input ) throws IOException { return input.readValueAs( Map.class ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private static List readArray( JsonParser input ) throws IOException { return input.readValueAs( List.class ); diff --git a/community/server/src/main/java/org/neo4j/server/rest/transactional/TransactionHandleRegistry.java b/community/server/src/main/java/org/neo4j/server/rest/transactional/TransactionHandleRegistry.java index d92bf2293fc1f..76676dd2cf575 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/transactional/TransactionHandleRegistry.java +++ b/community/server/src/main/java/org/neo4j/server/rest/transactional/TransactionHandleRegistry.java @@ -271,7 +271,7 @@ private void rollbackSuspended( Predicate predicate ) for ( Map.Entry entry : registry.entrySet() ) { TransactionMarker marker = entry.getValue(); - if (marker.isSuspended() && predicate.test(marker)) + if ( marker.isSuspended() && predicate.test( marker ) ) { candidateTransactionIdsToRollback.add( entry.getKey() ); } diff --git a/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalPeriodTransactionMessContainer.java b/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalPeriodTransactionMessContainer.java index c1ecbb7dd4336..49c065c35c1ab 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalPeriodTransactionMessContainer.java +++ b/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalPeriodTransactionMessContainer.java @@ -30,9 +30,9 @@ import org.neo4j.kernel.impl.coreapi.PropertyContainerLocker; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; import org.neo4j.kernel.impl.query.Neo4jTransactionalContextFactory; -import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo; import org.neo4j.kernel.impl.query.TransactionalContext; import org.neo4j.kernel.impl.query.TransactionalContextFactory; +import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo; import org.neo4j.server.rest.web.HttpConnectionInfoFactory; public class TransitionalPeriodTransactionMessContainer @@ -65,7 +65,7 @@ public TransactionalContext create( Type type, SecurityContext securityContext, String query, - Map queryParameters) + Map queryParameters ) { TransactionalContextFactory contextFactory = Neo4jTransactionalContextFactory.create( service, locker ); ClientConnectionInfo clientConnection = HttpConnectionInfoFactory.create( request ); diff --git a/community/server/src/main/java/org/neo4j/server/rest/transactional/error/Neo4jError.java b/community/server/src/main/java/org/neo4j/server/rest/transactional/error/Neo4jError.java index 034ee9a4e1f03..a8a5c3c2ed9d5 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/transactional/error/Neo4jError.java +++ b/community/server/src/main/java/org/neo4j/server/rest/transactional/error/Neo4jError.java @@ -42,7 +42,7 @@ public class Neo4jError public Neo4jError( Status status, String message ) { - this(status, new RuntimeException( message )); + this( status, new RuntimeException( message ) ); } public Neo4jError( Status status, Throwable cause ) diff --git a/community/server/src/main/java/org/neo4j/server/rest/web/BatchOperationService.java b/community/server/src/main/java/org/neo4j/server/rest/web/BatchOperationService.java index d1fcf5b6a0219..340c49e27137a 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/web/BatchOperationService.java +++ b/community/server/src/main/java/org/neo4j/server/rest/web/BatchOperationService.java @@ -51,7 +51,7 @@ import static org.neo4j.udc.UsageDataKeys.Features.http_batch_endpoint; import static org.neo4j.udc.UsageDataKeys.features; -@Path("/batch") +@Path( "/batch" ) public class BatchOperationService { @@ -75,8 +75,8 @@ public void setRepresentationWriteHandler( RepresentationWriteHandler representa } @POST - public Response performBatchOperations(@Context UriInfo uriInfo, - @Context HttpHeaders httpHeaders, @Context HttpServletRequest req, InputStream body) + public Response performBatchOperations( @Context UriInfo uriInfo, + @Context HttpHeaders httpHeaders, @Context HttpServletRequest req, InputStream body ) { usage.get( features ).flag( http_batch_endpoint ); if ( isStreaming( httpHeaders ) ) diff --git a/community/server/src/main/java/org/neo4j/server/rest/web/CypherService.java b/community/server/src/main/java/org/neo4j/server/rest/web/CypherService.java index c760358051eb5..7c931beb693bf 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/web/CypherService.java +++ b/community/server/src/main/java/org/neo4j/server/rest/web/CypherService.java @@ -45,7 +45,7 @@ import static org.neo4j.udc.UsageDataKeys.Features.http_cypher_endpoint; import static org.neo4j.udc.UsageDataKeys.features; -@Path("/cypher") +@Path( "/cypher" ) public class CypherService { @@ -78,12 +78,12 @@ public OutputFormat getOutputFormat() } @POST - @SuppressWarnings({"unchecked", "ParameterCanBeLocal"}) - public Response cypher(String body, + @SuppressWarnings( {"unchecked", "ParameterCanBeLocal"} ) + public Response cypher( String body, @Context HttpServletRequest request, @QueryParam( INCLUDE_STATS_PARAM ) boolean includeStats, @QueryParam( INCLUDE_PLAN_PARAM ) boolean includePlan, - @QueryParam( PROFILE_PARAM ) boolean profile) throws BadInputException + @QueryParam( PROFILE_PARAM ) boolean profile ) throws BadInputException { usage.get( features ).flag( http_cypher_endpoint ); @@ -104,7 +104,7 @@ public Response cypher(String body, } catch ( ClassCastException e ) { - return output.badRequest( new IllegalArgumentException("Parameters must be a JSON map") ); + return output.badRequest( new IllegalArgumentException( "Parameters must be a JSON map" ) ); } try @@ -141,7 +141,7 @@ public Response cypher(String body, } catch ( Throwable e ) { - if (e.getCause() instanceof CypherException) + if ( e.getCause() instanceof CypherException ) { return output.badRequest( e.getCause() ); } diff --git a/community/server/src/main/java/org/neo4j/server/rest/web/InternalJettyServletRequest.java b/community/server/src/main/java/org/neo4j/server/rest/web/InternalJettyServletRequest.java index 230f40caf7355..80fa09ffa098c 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/web/InternalJettyServletRequest.java +++ b/community/server/src/main/java/org/neo4j/server/rest/web/InternalJettyServletRequest.java @@ -267,9 +267,9 @@ public Cookie[] getCookies() return cookies; } - public void addHeader(String header, String value) + public void addHeader( String header, String value ) { - headers.put(header, value); + headers.put( header, value ); } @Override diff --git a/community/server/src/main/java/org/neo4j/server/rest/web/InternalJettyServletResponse.java b/community/server/src/main/java/org/neo4j/server/rest/web/InternalJettyServletResponse.java index a0caea254ab4b..adcc0d0145efa 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/web/InternalJettyServletResponse.java +++ b/community/server/src/main/java/org/neo4j/server/rest/web/InternalJettyServletResponse.java @@ -60,7 +60,7 @@ public String toString() } catch ( Exception e ) { - throw new RuntimeException( e); + throw new RuntimeException( e ); } } diff --git a/community/server/src/main/java/org/neo4j/server/rest/web/RestfulGraphDatabase.java b/community/server/src/main/java/org/neo4j/server/rest/web/RestfulGraphDatabase.java index b33ae3c740744..ec76435e1eff4 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/web/RestfulGraphDatabase.java +++ b/community/server/src/main/java/org/neo4j/server/rest/web/RestfulGraphDatabase.java @@ -80,7 +80,7 @@ @Path( "/" ) public class RestfulGraphDatabase { - @SuppressWarnings("serial") + @SuppressWarnings( "serial" ) public static class AmpersandSeparatedCollection extends LinkedHashSet { public AmpersandSeparatedCollection( String path ) @@ -244,7 +244,7 @@ public Response getRoot() // Nodes @POST - @Path(PATH_NODES) + @Path( PATH_NODES ) public Response createNode( String body ) { try @@ -271,8 +271,8 @@ private Response generateBadRequestDueToMangledJsonResponse( String body ) } @GET - @Path(PATH_NODE) - public Response getNode( @PathParam("nodeId") long nodeId ) + @Path( PATH_NODE ) + public Response getNode( @PathParam( "nodeId" ) long nodeId ) { try { @@ -285,8 +285,8 @@ public Response getNode( @PathParam("nodeId") long nodeId ) } @DELETE - @Path(PATH_NODE) - public Response deleteNode( @PathParam("nodeId") long nodeId ) + @Path( PATH_NODE ) + public Response deleteNode( @PathParam( "nodeId" ) long nodeId ) { try { @@ -306,8 +306,8 @@ public Response deleteNode( @PathParam("nodeId") long nodeId ) // Node properties @PUT - @Path(PATH_NODE_PROPERTIES) - public Response setAllNodeProperties( @PathParam("nodeId") long nodeId, String body ) + @Path( PATH_NODE_PROPERTIES ) + public Response setAllNodeProperties( @PathParam( "nodeId" ) long nodeId, String body ) { try { @@ -333,8 +333,8 @@ public Response setAllNodeProperties( @PathParam("nodeId") long nodeId, String b } @GET - @Path(PATH_NODE_PROPERTIES) - public Response getAllNodeProperties( @PathParam("nodeId") long nodeId ) + @Path( PATH_NODE_PROPERTIES ) + public Response getAllNodeProperties( @PathParam( "nodeId" ) long nodeId ) { try { @@ -347,9 +347,9 @@ public Response getAllNodeProperties( @PathParam("nodeId") long nodeId ) } @PUT - @Path(PATH_NODE_PROPERTY) - public Response setNodeProperty( @PathParam("nodeId") long nodeId, - @PathParam("key") String key, String body ) + @Path( PATH_NODE_PROPERTY ) + public Response setNodeProperty( @PathParam( "nodeId" ) long nodeId, + @PathParam( "key" ) String key, String body ) { try { @@ -367,7 +367,7 @@ public Response setNodeProperty( @PathParam("nodeId") long nodeId, { return output.notFound( e ); } - catch ( org.neo4j.graphdb.ConstraintViolationException e) + catch ( org.neo4j.graphdb.ConstraintViolationException e ) { return output.conflict( e ); } @@ -375,8 +375,8 @@ public Response setNodeProperty( @PathParam("nodeId") long nodeId, } @GET - @Path(PATH_NODE_PROPERTY) - public Response getNodeProperty( @PathParam("nodeId") long nodeId, @PathParam("key") String key ) + @Path( PATH_NODE_PROPERTY ) + public Response getNodeProperty( @PathParam( "nodeId" ) long nodeId, @PathParam( "key" ) String key ) { try { @@ -393,8 +393,8 @@ public Response getNodeProperty( @PathParam("nodeId") long nodeId, @PathParam("k } @DELETE - @Path(PATH_NODE_PROPERTY) - public Response deleteNodeProperty( @PathParam("nodeId") long nodeId, @PathParam("key") String key ) + @Path( PATH_NODE_PROPERTY ) + public Response deleteNodeProperty( @PathParam( "nodeId" ) long nodeId, @PathParam( "key" ) String key ) { try { @@ -412,8 +412,8 @@ public Response deleteNodeProperty( @PathParam("nodeId") long nodeId, @PathParam } @DELETE - @Path(PATH_NODE_PROPERTIES) - public Response deleteAllNodeProperties( @PathParam("nodeId") long nodeId ) + @Path( PATH_NODE_PROPERTIES ) + public Response deleteAllNodeProperties( @PathParam( "nodeId" ) long nodeId ) { try { @@ -531,7 +531,7 @@ public Response getNodeLabels( @PathParam( "nodeId" ) long nodeId ) @GET @Path( PATH_ALL_NODES_LABELED ) - public Response getNodesWithLabelAndProperty( @PathParam("label") String labelName, @Context UriInfo uriInfo ) + public Response getNodesWithLabelAndProperty( @PathParam( "label" ) String labelName, @Context UriInfo uriInfo ) { try { @@ -568,10 +568,10 @@ public Response getAllPropertyKeys( ) // Relationships - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) @POST - @Path(PATH_NODE_RELATIONSHIPS) - public Response createRelationship( @PathParam("nodeId") long startNodeId, String body ) + @Path( PATH_NODE_RELATIONSHIPS ) + public Response createRelationship( @PathParam( "nodeId" ) long startNodeId, String body ) { final Map data; final long endNodeId; @@ -615,8 +615,8 @@ public Response createRelationship( @PathParam("nodeId") long startNodeId, Strin } @GET - @Path(PATH_RELATIONSHIP) - public Response getRelationship( @PathParam("relationshipId") long relationshipId ) + @Path( PATH_RELATIONSHIP ) + public Response getRelationship( @PathParam( "relationshipId" ) long relationshipId ) { try { @@ -629,8 +629,8 @@ public Response getRelationship( @PathParam("relationshipId") long relationshipI } @DELETE - @Path(PATH_RELATIONSHIP) - public Response deleteRelationship( @PathParam("relationshipId") long relationshipId ) + @Path( PATH_RELATIONSHIP ) + public Response deleteRelationship( @PathParam( "relationshipId" ) long relationshipId ) { try { @@ -644,9 +644,9 @@ public Response deleteRelationship( @PathParam("relationshipId") long relationsh } @GET - @Path(PATH_NODE_RELATIONSHIPS_W_DIR) - public Response getNodeRelationships( @PathParam("nodeId") long nodeId, - @PathParam("direction") RelationshipDirection direction ) + @Path( PATH_NODE_RELATIONSHIPS_W_DIR ) + public Response getNodeRelationships( @PathParam( "nodeId" ) long nodeId, + @PathParam( "direction" ) RelationshipDirection direction ) { try { @@ -659,10 +659,10 @@ public Response getNodeRelationships( @PathParam("nodeId") long nodeId, } @GET - @Path(PATH_NODE_RELATIONSHIPS_W_DIR_N_TYPES) - public Response getNodeRelationships( @PathParam("nodeId") long nodeId, - @PathParam("direction") RelationshipDirection direction, - @PathParam("types") AmpersandSeparatedCollection types ) + @Path( PATH_NODE_RELATIONSHIPS_W_DIR_N_TYPES ) + public Response getNodeRelationships( @PathParam( "nodeId" ) long nodeId, + @PathParam( "direction" ) RelationshipDirection direction, + @PathParam( "types" ) AmpersandSeparatedCollection types ) { try { @@ -677,9 +677,9 @@ public Response getNodeRelationships( @PathParam("nodeId") long nodeId, // Degrees @GET - @Path(PATH_NODE_DEGREE_W_DIR) - public Response getNodeDegree( @PathParam("nodeId") long nodeId, - @PathParam("direction") RelationshipDirection direction ) + @Path( PATH_NODE_DEGREE_W_DIR ) + public Response getNodeDegree( @PathParam( "nodeId" ) long nodeId, + @PathParam( "direction" ) RelationshipDirection direction ) { try { @@ -692,10 +692,10 @@ public Response getNodeDegree( @PathParam("nodeId") long nodeId, } @GET - @Path(PATH_NODE_DEGREE_W_DIR_N_TYPES) - public Response getNodeDegree(@PathParam("nodeId") long nodeId, - @PathParam("direction") RelationshipDirection direction, - @PathParam("types") AmpersandSeparatedCollection types ) + @Path( PATH_NODE_DEGREE_W_DIR_N_TYPES ) + public Response getNodeDegree( @PathParam( "nodeId" ) long nodeId, + @PathParam( "direction" ) RelationshipDirection direction, + @PathParam( "types" ) AmpersandSeparatedCollection types ) { try { @@ -710,8 +710,8 @@ public Response getNodeDegree(@PathParam("nodeId") long nodeId, // Relationship properties @GET - @Path(PATH_RELATIONSHIP_PROPERTIES) - public Response getAllRelationshipProperties( @PathParam("relationshipId") long relationshipId ) + @Path( PATH_RELATIONSHIP_PROPERTIES ) + public Response getAllRelationshipProperties( @PathParam( "relationshipId" ) long relationshipId ) { try { @@ -724,9 +724,9 @@ public Response getAllRelationshipProperties( @PathParam("relationshipId") long } @GET - @Path(PATH_RELATIONSHIP_PROPERTY) - public Response getRelationshipProperty( @PathParam("relationshipId") long relationshipId, - @PathParam("key") String key ) + @Path( PATH_RELATIONSHIP_PROPERTY ) + public Response getRelationshipProperty( @PathParam( "relationshipId" ) long relationshipId, + @PathParam( "key" ) String key ) { try { @@ -743,9 +743,9 @@ public Response getRelationshipProperty( @PathParam("relationshipId") long relat } @PUT - @Path(PATH_RELATIONSHIP_PROPERTIES) - @Consumes(MediaType.APPLICATION_JSON) - public Response setAllRelationshipProperties( @PathParam("relationshipId") long relationshipId, String body ) + @Path( PATH_RELATIONSHIP_PROPERTIES ) + @Consumes( MediaType.APPLICATION_JSON ) + public Response setAllRelationshipProperties( @PathParam( "relationshipId" ) long relationshipId, String body ) { try { @@ -763,10 +763,10 @@ public Response setAllRelationshipProperties( @PathParam("relationshipId") long } @PUT - @Path(PATH_RELATIONSHIP_PROPERTY) - @Consumes(MediaType.APPLICATION_JSON) - public Response setRelationshipProperty( @PathParam("relationshipId") long relationshipId, - @PathParam("key") String key, String body ) + @Path( PATH_RELATIONSHIP_PROPERTY ) + @Consumes( MediaType.APPLICATION_JSON ) + public Response setRelationshipProperty( @PathParam( "relationshipId" ) long relationshipId, + @PathParam( "key" ) String key, String body ) { try { @@ -784,8 +784,8 @@ public Response setRelationshipProperty( @PathParam("relationshipId") long relat } @DELETE - @Path(PATH_RELATIONSHIP_PROPERTIES) - public Response deleteAllRelationshipProperties( @PathParam("relationshipId") long relationshipId ) + @Path( PATH_RELATIONSHIP_PROPERTIES ) + public Response deleteAllRelationshipProperties( @PathParam( "relationshipId" ) long relationshipId ) { try { @@ -803,9 +803,9 @@ public Response deleteAllRelationshipProperties( @PathParam("relationshipId") lo } @DELETE - @Path(PATH_RELATIONSHIP_PROPERTY) - public Response deleteRelationshipProperty( @PathParam("relationshipId") long relationshipId, - @PathParam("key") String key ) + @Path( PATH_RELATIONSHIP_PROPERTY ) + public Response deleteRelationshipProperty( @PathParam( "relationshipId" ) long relationshipId, + @PathParam( "key" ) String key ) { try { @@ -825,7 +825,7 @@ public Response deleteRelationshipProperty( @PathParam("relationshipId") long re // Index @GET - @Path(PATH_NODE_INDEX) + @Path( PATH_NODE_INDEX ) public Response getNodeIndexRoot() { if ( actions.getNodeIndexNames().length == 0 ) @@ -836,8 +836,8 @@ public Response getNodeIndexRoot() } @POST - @Path(PATH_NODE_INDEX) - @Consumes(MediaType.APPLICATION_JSON) + @Path( PATH_NODE_INDEX ) + @Consumes( MediaType.APPLICATION_JSON ) public Response jsonCreateNodeIndex( String json ) { try @@ -855,7 +855,7 @@ public Response jsonCreateNodeIndex( String json ) } @GET - @Path(PATH_RELATIONSHIP_INDEX) + @Path( PATH_RELATIONSHIP_INDEX ) public Response getRelationshipIndexRoot() { if ( actions.getRelationshipIndexNames().length == 0 ) @@ -866,8 +866,8 @@ public Response getRelationshipIndexRoot() } @POST - @Path(PATH_RELATIONSHIP_INDEX) - @Consumes(MediaType.APPLICATION_JSON) + @Path( PATH_RELATIONSHIP_INDEX ) + @Consumes( MediaType.APPLICATION_JSON ) public Response jsonCreateRelationshipIndex( String json ) { try @@ -889,10 +889,10 @@ public Response jsonCreateRelationshipIndex( String json ) } @GET - @Path(PATH_NAMED_NODE_INDEX) - public Response getIndexedNodesByQuery( @PathParam("indexName") String indexName, - @QueryParam("query") String query, - @QueryParam("order") String order ) + @Path( PATH_NAMED_NODE_INDEX ) + public Response getIndexedNodesByQuery( @PathParam( "indexName" ) String indexName, + @QueryParam( "query" ) String query, + @QueryParam( "order" ) String order ) { try { @@ -910,8 +910,8 @@ public Response getIndexedNodesByQuery( @PathParam("indexName") String indexName } @GET - @Path(PATH_AUTO_INDEX) - public Response getAutoIndexedNodesByQuery( @PathParam("type") String type, @QueryParam("query") String query ) + @Path( PATH_AUTO_INDEX ) + public Response getAutoIndexedNodesByQuery( @PathParam( "type" ) String type, @QueryParam( "query" ) String query ) { try { @@ -940,10 +940,9 @@ else if ( type.equals( RELATIONSHIP_AUTO_INDEX_TYPE ) ) } @DELETE - @Path(PATH_NAMED_NODE_INDEX) - @Consumes(MediaType.APPLICATION_JSON) - public Response deleteNodeIndex( - @PathParam("indexName") String indexName ) + @Path( PATH_NAMED_NODE_INDEX ) + @Consumes( MediaType.APPLICATION_JSON ) + public Response deleteNodeIndex( @PathParam( "indexName" ) String indexName ) { try { @@ -961,9 +960,9 @@ public Response deleteNodeIndex( } @DELETE - @Path(PATH_NAMED_RELATIONSHIP_INDEX) - @Consumes(MediaType.APPLICATION_JSON) - public Response deleteRelationshipIndex( @PathParam("indexName") String indexName ) + @Path( PATH_NAMED_RELATIONSHIP_INDEX ) + @Consumes( MediaType.APPLICATION_JSON ) + public Response deleteRelationshipIndex( @PathParam( "indexName" ) String indexName ) { try { @@ -981,10 +980,10 @@ public Response deleteRelationshipIndex( @PathParam("indexName") String indexNam } @POST - @Path(PATH_NAMED_NODE_INDEX) - @Consumes(MediaType.APPLICATION_JSON) - public Response addToNodeIndex( @PathParam("indexName") String indexName, @QueryParam("unique") String unique, - @QueryParam("uniqueness") String uniqueness, String postBody ) + @Path( PATH_NAMED_NODE_INDEX ) + @Consumes( MediaType.APPLICATION_JSON ) + public Response addToNodeIndex( @PathParam( "indexName" ) String indexName, @QueryParam( "unique" ) String unique, + @QueryParam( "uniqueness" ) String uniqueness, String postBody ) { int otherHeaders = 512; int maximumSizeInBytes = config.getInt( ServerSettings.maximum_response_header_size.name() ) - otherHeaders; @@ -1091,10 +1090,10 @@ private Response valueTooBig() } @POST - @Path(PATH_NAMED_RELATIONSHIP_INDEX) - public Response addToRelationshipIndex( @PathParam("indexName") String indexName, - @QueryParam("unique") String unique, @QueryParam("uniqueness") String - uniqueness, String postBody ) + @Path( PATH_NAMED_RELATIONSHIP_INDEX ) + public Response addToRelationshipIndex( @PathParam( "indexName" ) String indexName, + @QueryParam( "unique" ) String unique, + @QueryParam( "uniqueness" ) String uniqueness, String postBody ) { try { @@ -1214,7 +1213,7 @@ private String getStringOrNull( Map map, String key ) throws Bad throw new InvalidArgumentsException( "\"" + key + "\" should be a string" ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private static Map getMapOrNull( Map data, String key ) throws BadInputException { Object object = data.get( key ); @@ -1230,10 +1229,10 @@ private static Map getMapOrNull( Map data, Strin } @GET - @Path(PATH_NODE_INDEX_ID) - public Response getNodeFromIndexUri( @PathParam("indexName") String indexName, - @PathParam("key") String key, @PathParam("value") String value, - @PathParam("id") long id ) + @Path( PATH_NODE_INDEX_ID ) + public Response getNodeFromIndexUri( @PathParam( "indexName" ) String indexName, + @PathParam( "key" ) String key, @PathParam( "value" ) String value, + @PathParam( "id" ) long id ) { try { @@ -1250,18 +1249,18 @@ public Response getNodeFromIndexUri( @PathParam("indexName") String indexName, } @GET - @Path(PATH_RELATIONSHIP_INDEX_ID) - public Response getRelationshipFromIndexUri( @PathParam("indexName") String indexName, - @PathParam("key") String key, @PathParam("value") String value, - @PathParam("id") long id ) + @Path( PATH_RELATIONSHIP_INDEX_ID ) + public Response getRelationshipFromIndexUri( @PathParam( "indexName" ) String indexName, + @PathParam( "key" ) String key, @PathParam( "value" ) String value, + @PathParam( "id" ) long id ) { return output.ok( actions.getIndexedRelationship( indexName, key, value, id ) ); } @GET - @Path(PATH_NODE_INDEX_GET) - public Response getIndexedNodes( @PathParam("indexName") String indexName, - @PathParam("key") String key, @PathParam("value") String value ) + @Path( PATH_NODE_INDEX_GET ) + public Response getIndexedNodes( @PathParam( "indexName" ) String indexName, + @PathParam( "key" ) String key, @PathParam( "value" ) String value ) { try { @@ -1278,9 +1277,9 @@ public Response getIndexedNodes( @PathParam("indexName") String indexName, } @GET - @Path(PATH_AUTO_INDEX_GET) - public Response getAutoIndexedNodes( @PathParam("type") String type, @PathParam("key") String key, - @PathParam("value") String value ) + @Path( PATH_AUTO_INDEX_GET ) + public Response getAutoIndexedNodes( @PathParam( "type" ) String type, @PathParam( "key" ) String key, + @PathParam( "value" ) String value ) { try { @@ -1309,12 +1308,12 @@ else if ( type.equals( RELATIONSHIP_AUTO_INDEX_TYPE ) ) } @GET - @Path(PATH_NODE_INDEX_QUERY_WITH_KEY) + @Path( PATH_NODE_INDEX_QUERY_WITH_KEY ) public Response getIndexedNodesByQuery( - @PathParam("indexName") String indexName, - @PathParam("key") String key, - @QueryParam("query") String query, - @PathParam("order") String order ) + @PathParam( "indexName" ) String indexName, + @PathParam( "key" ) String key, + @QueryParam( "query" ) String query, + @PathParam( "order" ) String order ) { try { @@ -1332,9 +1331,9 @@ public Response getIndexedNodesByQuery( } @GET - @Path(PATH_RELATIONSHIP_INDEX_GET) - public Response getIndexedRelationships( @PathParam("indexName") String indexName, - @PathParam("key") String key, @PathParam("value") String value ) + @Path( PATH_RELATIONSHIP_INDEX_GET ) + public Response getIndexedRelationships( @PathParam( "indexName" ) String indexName, + @PathParam( "key" ) String key, @PathParam( "value" ) String value ) { try { @@ -1351,30 +1350,30 @@ public Response getIndexedRelationships( @PathParam("indexName") String indexNam } @GET - @Path(PATH_AUTO_INDEX_STATUS) - public Response isAutoIndexerEnabled( @PathParam("type") String type ) + @Path( PATH_AUTO_INDEX_STATUS ) + public Response isAutoIndexerEnabled( @PathParam( "type" ) String type ) { return output.ok( actions.isAutoIndexerEnabled( type ) ); } @PUT - @Path(PATH_AUTO_INDEX_STATUS) - public Response setAutoIndexerEnabled( @PathParam("type") String type, String enable ) + @Path( PATH_AUTO_INDEX_STATUS ) + public Response setAutoIndexerEnabled( @PathParam( "type" ) String type, String enable ) { actions.setAutoIndexerEnabled( type, Boolean.parseBoolean( enable ) ); return output.ok( Representation.emptyRepresentation() ); } @GET - @Path(PATH_AUTO_INDEXED_PROPERTIES) - public Response getAutoIndexedProperties( @PathParam("type") String type ) + @Path( PATH_AUTO_INDEXED_PROPERTIES ) + public Response getAutoIndexedProperties( @PathParam( "type" ) String type ) { return output.ok( actions.getAutoIndexedProperties( type ) ); } @POST - @Path(PATH_AUTO_INDEXED_PROPERTIES) - public Response startAutoIndexingProperty( @PathParam("type") String type, String property ) + @Path( PATH_AUTO_INDEXED_PROPERTIES ) + public Response startAutoIndexingProperty( @PathParam( "type" ) String type, String property ) { actions.startAutoIndexingProperty( type, property ); return output.ok( Representation.emptyRepresentation() ); @@ -1382,18 +1381,19 @@ public Response startAutoIndexingProperty( @PathParam("type") String type, Strin } @DELETE - @Path(PATH_AUTO_INDEX_PROPERTY_DELETE) - public Response stopAutoIndexingProperty( @PathParam("type") String type, @PathParam("property") String property ) + @Path( PATH_AUTO_INDEX_PROPERTY_DELETE ) + public Response stopAutoIndexingProperty( @PathParam( "type" ) String type, + @PathParam( "property" ) String property ) { actions.stopAutoIndexingProperty( type, property ); return output.ok( Representation.emptyRepresentation() ); } @GET - @Path(PATH_NAMED_RELATIONSHIP_INDEX) - public Response getIndexedRelationshipsByQuery( @PathParam("indexName") String indexName, - @QueryParam("query") String query, - @QueryParam("order") String order ) + @Path( PATH_NAMED_RELATIONSHIP_INDEX ) + public Response getIndexedRelationshipsByQuery( @PathParam( "indexName" ) String indexName, + @QueryParam( "query" ) String query, + @QueryParam( "order" ) String order ) { try { @@ -1411,11 +1411,11 @@ public Response getIndexedRelationshipsByQuery( @PathParam("indexName") String i } @GET - @Path(PATH_RELATIONSHIP_INDEX_QUERY_WITH_KEY) - public Response getIndexedRelationshipsByQuery( @PathParam("indexName") String indexName, - @PathParam("key") String key, - @QueryParam("query") String query, - @QueryParam("order") String order ) + @Path( PATH_RELATIONSHIP_INDEX_QUERY_WITH_KEY ) + public Response getIndexedRelationshipsByQuery( @PathParam( "indexName" ) String indexName, + @PathParam( "key" ) String key, + @QueryParam( "query" ) String query, + @QueryParam( "order" ) String order ) { try { @@ -1433,10 +1433,10 @@ public Response getIndexedRelationshipsByQuery( @PathParam("indexName") String i } @DELETE - @Path(PATH_NODE_INDEX_ID) - public Response deleteFromNodeIndex( @PathParam("indexName") String indexName, - @PathParam("key") String key, @PathParam("value") String value, - @PathParam("id") long id ) + @Path( PATH_NODE_INDEX_ID ) + public Response deleteFromNodeIndex( @PathParam( "indexName" ) String indexName, + @PathParam( "key" ) String key, @PathParam( "value" ) String value, + @PathParam( "id" ) long id ) { try { @@ -1458,9 +1458,9 @@ public Response deleteFromNodeIndex( @PathParam("indexName") String indexName, } @DELETE - @Path(PATH_NODE_INDEX_REMOVE_KEY) - public Response deleteFromNodeIndexNoValue( @PathParam("indexName") String indexName, - @PathParam("key") String key, @PathParam("id") long id ) + @Path( PATH_NODE_INDEX_REMOVE_KEY ) + public Response deleteFromNodeIndexNoValue( @PathParam( "indexName" ) String indexName, + @PathParam( "key" ) String key, @PathParam( "id" ) long id ) { try { @@ -1482,8 +1482,9 @@ public Response deleteFromNodeIndexNoValue( @PathParam("indexName") String index } @DELETE - @Path(PATH_NODE_INDEX_REMOVE) - public Response deleteFromNodeIndexNoKeyValue( @PathParam("indexName") String indexName, @PathParam("id") long id ) + @Path( PATH_NODE_INDEX_REMOVE ) + public Response deleteFromNodeIndexNoKeyValue( @PathParam( "indexName" ) String indexName, @PathParam( "id" ) long + id ) { try { @@ -1505,10 +1506,10 @@ public Response deleteFromNodeIndexNoKeyValue( @PathParam("indexName") String in } @DELETE - @Path(PATH_RELATIONSHIP_INDEX_ID) - public Response deleteFromRelationshipIndex( @PathParam("indexName") String indexName, - @PathParam("key") String key, @PathParam("value") String value, - @PathParam("id") long id ) + @Path( PATH_RELATIONSHIP_INDEX_ID ) + public Response deleteFromRelationshipIndex( @PathParam( "indexName" ) String indexName, + @PathParam( "key" ) String key, @PathParam( "value" ) String value, + @PathParam( "id" ) long id ) { try { @@ -1530,9 +1531,9 @@ public Response deleteFromRelationshipIndex( @PathParam("indexName") String inde } @DELETE - @Path(PATH_RELATIONSHIP_INDEX_REMOVE_KEY) - public Response deleteFromRelationshipIndexNoValue( @PathParam("indexName") String indexName, - @PathParam("key") String key, @PathParam("id") long id ) + @Path( PATH_RELATIONSHIP_INDEX_REMOVE_KEY ) + public Response deleteFromRelationshipIndexNoValue( @PathParam( "indexName" ) String indexName, + @PathParam( "key" ) String key, @PathParam( "id" ) long id ) { try { @@ -1554,9 +1555,9 @@ public Response deleteFromRelationshipIndexNoValue( @PathParam("indexName") Stri } @DELETE - @Path(PATH_RELATIONSHIP_INDEX_REMOVE) - public Response deleteFromRelationshipIndex( @PathParam("indexName") String indexName, - @PathParam("id") long id ) + @Path( PATH_RELATIONSHIP_INDEX_REMOVE ) + public Response deleteFromRelationshipIndex( @PathParam( "indexName" ) String indexName, + @PathParam( "id" ) long id ) { try { @@ -1580,9 +1581,9 @@ public Response deleteFromRelationshipIndex( @PathParam("indexName") String inde // Traversal @POST - @Path(PATH_NODE_TRAVERSE) - public Response traverse( @PathParam("nodeId") long startNode, - @PathParam("returnType") TraverserReturnType returnType, String body ) + @Path( PATH_NODE_TRAVERSE ) + public Response traverse( @PathParam( "nodeId" ) long startNode, + @PathParam( "returnType" ) TraverserReturnType returnType, String body ) { try { @@ -1605,8 +1606,8 @@ public Response traverse( @PathParam("nodeId") long startNode, // Paged traversal @DELETE - @Path(PATH_TO_PAGED_TRAVERSERS) - public Response removePagedTraverser( @PathParam("traverserId") String traverserId ) + @Path( PATH_TO_PAGED_TRAVERSERS ) + public Response removePagedTraverser( @PathParam( "traverserId" ) String traverserId ) { if ( actions.removePagedTraverse( traverserId ) ) { @@ -1619,9 +1620,9 @@ public Response removePagedTraverser( @PathParam("traverserId") String traverser } @GET - @Path(PATH_TO_PAGED_TRAVERSERS) - public Response pagedTraverse( @PathParam("traverserId") String traverserId, - @PathParam("returnType") TraverserReturnType returnType ) + @Path( PATH_TO_PAGED_TRAVERSERS ) + public Response pagedTraverse( @PathParam( "traverserId" ) String traverserId, + @PathParam( "returnType" ) TraverserReturnType returnType ) { try { @@ -1638,12 +1639,11 @@ public Response pagedTraverse( @PathParam("traverserId") String traverserId, } @POST - @Path(PATH_TO_CREATE_PAGED_TRAVERSERS) - public Response createPagedTraverser( @PathParam("nodeId") long startNode, - @PathParam("returnType") TraverserReturnType returnType, - @QueryParam("pageSize") @DefaultValue(FIFTY_ENTRIES) int pageSize, - @QueryParam("leaseTime") @DefaultValue(SIXTY_SECONDS) int - leaseTimeInSeconds, String body ) + @Path( PATH_TO_CREATE_PAGED_TRAVERSERS ) + public Response createPagedTraverser( @PathParam( "nodeId" ) long startNode, + @PathParam( "returnType" ) TraverserReturnType returnType, + @QueryParam( "pageSize" ) @DefaultValue( FIFTY_ENTRIES ) int pageSize, + @QueryParam( "leaseTime" ) @DefaultValue( SIXTY_SECONDS ) int leaseTimeInSeconds, String body ) { try { @@ -1693,8 +1693,8 @@ private void validatePageSize( int pageSize ) throws BadInputException } @POST - @Path(PATH_NODE_PATH) - public Response singlePath( @PathParam("nodeId") long startNode, String body ) + @Path( PATH_NODE_PATH ) + public Response singlePath( @PathParam( "nodeId" ) long startNode, String body ) { final Map description; final long endNode; @@ -1720,8 +1720,8 @@ public Response singlePath( @PathParam("nodeId") long startNode, String body ) } @POST - @Path(PATH_NODE_PATHS) - public Response allPaths( @PathParam("nodeId") long startNode, String body ) + @Path( PATH_NODE_PATHS ) + public Response allPaths( @PathParam( "nodeId" ) long startNode, String body ) { final Map description; final long endNode; @@ -1823,7 +1823,7 @@ public Response getSchemaIndexes() @GET @Path( PATH_SCHEMA_INDEX_LABEL ) - public Response getSchemaIndexesForLabel( @PathParam("label") String labelName ) + public Response getSchemaIndexesForLabel( @PathParam( "label" ) String labelName ) { return output.ok( actions.getSchemaIndexes( labelName ) ); } @@ -1924,7 +1924,7 @@ public Response dropRelationshipPropertyExistenceConstraint( @PathParam( "type" } @GET - @Path(PATH_SCHEMA_CONSTRAINT) + @Path( PATH_SCHEMA_CONSTRAINT ) public Response getSchemaConstraints() { return output.ok( actions.getConstraints() ); diff --git a/community/server/src/main/java/org/neo4j/server/rest/web/TransactionalService.java b/community/server/src/main/java/org/neo4j/server/rest/web/TransactionalService.java index a9e55cc8566b7..ea47b744bee81 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/web/TransactionalService.java +++ b/community/server/src/main/java/org/neo4j/server/rest/web/TransactionalService.java @@ -57,7 +57,7 @@ * This does basic mapping from HTTP to {@link org.neo4j.server.rest.transactional.TransactionFacade}, and should not * do anything more complicated than that. */ -@Path("/transaction") +@Path( "/transaction" ) public class TransactionalService { private final TransactionFacade facade; @@ -75,8 +75,8 @@ public TransactionalService( @Context TransactionFacade facade, @Context UriInfo } @POST - @Consumes({MediaType.APPLICATION_JSON}) - @Produces({MediaType.APPLICATION_JSON}) + @Consumes( {MediaType.APPLICATION_JSON} ) + @Produces( {MediaType.APPLICATION_JSON} ) public Response executeStatementsInNewTransaction( final InputStream input, @Context final UriInfo uriInfo, @Context final HttpServletRequest request ) { @@ -99,10 +99,10 @@ public Response executeStatementsInNewTransaction( final InputStream input, @Con } @POST - @Path("/{id}") - @Consumes({MediaType.APPLICATION_JSON}) - @Produces({MediaType.APPLICATION_JSON}) - public Response executeStatements( @PathParam("id") final long id, final InputStream input, + @Path( "/{id}" ) + @Consumes( {MediaType.APPLICATION_JSON} ) + @Produces( {MediaType.APPLICATION_JSON} ) + public Response executeStatements( @PathParam( "id" ) final long id, final InputStream input, @Context final UriInfo uriInfo, @Context final HttpServletRequest request ) { final TransactionHandle transactionHandle; @@ -118,10 +118,11 @@ public Response executeStatements( @PathParam("id") final long id, final InputSt } @POST - @Path("/{id}/commit") - @Consumes({MediaType.APPLICATION_JSON}) - @Produces({MediaType.APPLICATION_JSON}) - public Response commitTransaction( @PathParam("id") final long id, final InputStream input, @Context final UriInfo uriInfo, + @Path( "/{id}/commit" ) + @Consumes( {MediaType.APPLICATION_JSON} ) + @Produces( {MediaType.APPLICATION_JSON} ) + public Response commitTransaction( @PathParam( "id" ) final long id, final InputStream input, @Context final + UriInfo uriInfo, @Context final HttpServletRequest request ) { final TransactionHandle transactionHandle; @@ -137,9 +138,9 @@ public Response commitTransaction( @PathParam("id") final long id, final InputSt } @POST - @Path("/commit") - @Consumes({MediaType.APPLICATION_JSON}) - @Produces({MediaType.APPLICATION_JSON}) + @Path( "/commit" ) + @Consumes( {MediaType.APPLICATION_JSON} ) + @Produces( {MediaType.APPLICATION_JSON} ) public Response commitNewTransaction( final InputStream input, @Context final UriInfo uriInfo, @Context final HttpServletRequest request ) { @@ -160,9 +161,9 @@ public Response commitNewTransaction( final InputStream input, @Context final Ur } @DELETE - @Path("/{id}") - @Consumes({MediaType.APPLICATION_JSON}) - public Response rollbackTransaction( @PathParam("id") final long id, @Context UriInfo uriInfo ) + @Path( "/{id}" ) + @Consumes( {MediaType.APPLICATION_JSON} ) + public Response rollbackTransaction( @PathParam( "id" ) final long id, @Context UriInfo uriInfo ) { final TransactionHandle transactionHandle; try diff --git a/community/server/src/main/java/org/neo4j/server/scripting/NoSuchScriptLanguageException.java b/community/server/src/main/java/org/neo4j/server/scripting/NoSuchScriptLanguageException.java index 31f842c934a1f..ced6e326027e0 100644 --- a/community/server/src/main/java/org/neo4j/server/scripting/NoSuchScriptLanguageException.java +++ b/community/server/src/main/java/org/neo4j/server/scripting/NoSuchScriptLanguageException.java @@ -23,6 +23,6 @@ public class NoSuchScriptLanguageException extends RuntimeException { public NoSuchScriptLanguageException( String msg ) { - super(msg); + super( msg ); } } diff --git a/community/server/src/main/java/org/neo4j/server/scripting/javascript/GlobalJavascriptInitializer.java b/community/server/src/main/java/org/neo4j/server/scripting/javascript/GlobalJavascriptInitializer.java index 8738034a37359..f9fe1c50c3d05 100644 --- a/community/server/src/main/java/org/neo4j/server/scripting/javascript/GlobalJavascriptInitializer.java +++ b/community/server/src/main/java/org/neo4j/server/scripting/javascript/GlobalJavascriptInitializer.java @@ -50,7 +50,7 @@ public enum Mode UNSAFE } - public static synchronized void initialize(Mode requestedMode) + public static synchronized void initialize( Mode requestedMode ) { if ( initializationMode != null ) { diff --git a/community/server/src/main/java/org/neo4j/server/scripting/javascript/JavascriptExecutor.java b/community/server/src/main/java/org/neo4j/server/scripting/javascript/JavascriptExecutor.java index 82b9e9a97b2e6..8db1506f0e7a8 100644 --- a/community/server/src/main/java/org/neo4j/server/scripting/javascript/JavascriptExecutor.java +++ b/community/server/src/main/java/org/neo4j/server/scripting/javascript/JavascriptExecutor.java @@ -46,7 +46,7 @@ public static class Factory implements ScriptExecutor.Factory * * @param enableSandboxing */ - public Factory(boolean enableSandboxing) + public Factory( boolean enableSandboxing ) { if ( enableSandboxing ) { @@ -82,9 +82,8 @@ public JavascriptExecutor( String script ) private Scriptable createPrototype( Context cx ) { Scriptable proto = cx.initStandardObjects(); - Scriptable topLevel = new ImporterTopLevel(cx); + Scriptable topLevel = new ImporterTopLevel( cx ); proto.setParentScope( topLevel ); - return proto; } diff --git a/community/server/src/main/java/org/neo4j/server/scripting/javascript/WhiteListClassShutter.java b/community/server/src/main/java/org/neo4j/server/scripting/javascript/WhiteListClassShutter.java index 9095b08b361d3..3e43b84b9872d 100644 --- a/community/server/src/main/java/org/neo4j/server/scripting/javascript/WhiteListClassShutter.java +++ b/community/server/src/main/java/org/neo4j/server/scripting/javascript/WhiteListClassShutter.java @@ -19,16 +19,16 @@ */ package org.neo4j.server.scripting.javascript; -import java.util.Set; - import org.mozilla.javascript.ClassShutter; +import java.util.Set; + public class WhiteListClassShutter implements ClassShutter { private Set whiteList; - public WhiteListClassShutter(Set whiteList) + public WhiteListClassShutter( Set whiteList ) { this.whiteList = whiteList; } diff --git a/community/server/src/main/java/org/neo4j/server/security/ssl/SslSocketConnectorFactory.java b/community/server/src/main/java/org/neo4j/server/security/ssl/SslSocketConnectorFactory.java index 51d48d1162d1d..43e6ba9b5ec7c 100644 --- a/community/server/src/main/java/org/neo4j/server/security/ssl/SslSocketConnectorFactory.java +++ b/community/server/src/main/java/org/neo4j/server/security/ssl/SslSocketConnectorFactory.java @@ -38,7 +38,7 @@ public class SslSocketConnectorFactory extends HttpConnectorFactory { public SslSocketConnectorFactory( Config configuration ) { - super(configuration); + super( configuration ); } @Override @@ -64,7 +64,7 @@ private SslConnectionFactory createSslConnectionFactory( KeyStoreInformation ksI sslContextFactory.setKeyStorePassword( String.valueOf( ksInfo.getKeyStorePassword() ) ); sslContextFactory.setKeyManagerPassword( String.valueOf( ksInfo.getKeyPassword() ) ); - return new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()); + return new SslConnectionFactory( sslContextFactory, HttpVersion.HTTP_1_1.asString() ); } } diff --git a/community/server/src/main/java/org/neo4j/server/web/HttpHeaderUtils.java b/community/server/src/main/java/org/neo4j/server/web/HttpHeaderUtils.java index d7efae859de62..6136eab131682 100644 --- a/community/server/src/main/java/org/neo4j/server/web/HttpHeaderUtils.java +++ b/community/server/src/main/java/org/neo4j/server/web/HttpHeaderUtils.java @@ -34,27 +34,28 @@ public class HttpHeaderUtils public static final String MAX_EXECUTION_TIME_HEADER = "max-execution-time"; - public static final Map CHARSET = Collections.singletonMap("charset", StandardCharsets.UTF_8.name()); + public static final Map CHARSET = + Collections.singletonMap( "charset", StandardCharsets.UTF_8.name() ); - public static MediaType mediaTypeWithCharsetUtf8(String mediaType) + public static MediaType mediaTypeWithCharsetUtf8( String mediaType ) { - return new MediaType(mediaType, null, CHARSET); + return new MediaType( mediaType, null, CHARSET ); } - public static MediaType mediaTypeWithCharsetUtf8(MediaType mediaType) + public static MediaType mediaTypeWithCharsetUtf8( MediaType mediaType ) { - Map parameters = mediaType.getParameters(); - if (parameters.isEmpty()) + Map parameters = mediaType.getParameters(); + if ( parameters.isEmpty() ) { - return new MediaType(mediaType.getType(), mediaType.getSubtype(), CHARSET); + return new MediaType( mediaType.getType(), mediaType.getSubtype(), CHARSET ); } - if (parameters.containsKey("charset")) + if ( parameters.containsKey( "charset" ) ) { return mediaType; } - Map paramsWithCharset = new HashMap(parameters); - paramsWithCharset.putAll(CHARSET); - return new MediaType(mediaType.getType(), mediaType.getSubtype(), paramsWithCharset); + Map paramsWithCharset = new HashMap( parameters ); + paramsWithCharset.putAll( CHARSET ); + return new MediaType( mediaType.getType(), mediaType.getSubtype(), paramsWithCharset ); } /** diff --git a/community/server/src/main/java/org/neo4j/server/web/Jetty9WebServer.java b/community/server/src/main/java/org/neo4j/server/web/Jetty9WebServer.java index 7233086f3a422..82087e92e1486 100644 --- a/community/server/src/main/java/org/neo4j/server/web/Jetty9WebServer.java +++ b/community/server/src/main/java/org/neo4j/server/web/Jetty9WebServer.java @@ -134,8 +134,8 @@ public String getPathSpec() public Jetty9WebServer( LogProvider logProvider, Config config ) { this.log = logProvider.getLog( getClass() ); - sslSocketFactory = new SslSocketConnectorFactory(config); - connectorFactory = new HttpConnectorFactory(config); + sslSocketFactory = new SslSocketConnectorFactory( config ); + connectorFactory = new HttpConnectorFactory( config ); } @Override diff --git a/community/server/src/main/java/org/neo4j/server/web/SimpleUriBuilder.java b/community/server/src/main/java/org/neo4j/server/web/SimpleUriBuilder.java index 4bc2a676406ee..0b804dfceed70 100644 --- a/community/server/src/main/java/org/neo4j/server/web/SimpleUriBuilder.java +++ b/community/server/src/main/java/org/neo4j/server/web/SimpleUriBuilder.java @@ -42,7 +42,7 @@ public URI buildURI( AdvertisedSocketAddress address, boolean isSsl ) sb.append( address.getHostname() ); int port = address.getPort(); - if ( port != 80 && port != 443) + if ( port != 80 && port != 443 ) { sb.append( ":" ); sb.append( port ); diff --git a/community/server/src/main/java/org/neo4j/server/web/StaticContentFilter.java b/community/server/src/main/java/org/neo4j/server/web/StaticContentFilter.java index 45c1083f2a32a..d1f640eacada3 100644 --- a/community/server/src/main/java/org/neo4j/server/web/StaticContentFilter.java +++ b/community/server/src/main/java/org/neo4j/server/web/StaticContentFilter.java @@ -42,7 +42,7 @@ public void doFilter( ServletRequest servletRequest, ServletResponse servletResp { HttpServletRequest request = (HttpServletRequest) servletRequest; HttpServletResponse response = (HttpServletResponse) servletResponse; - if ( request.getServletPath() != null && request.getServletPath().endsWith( ".html" )) + if ( request.getServletPath() != null && request.getServletPath().endsWith( ".html" ) ) { response.addHeader( "Cache-Control", "private, no-cache, no-store, proxy-revalidate, no-transform" ); response.addHeader( "Pragma", "no-cache" ); diff --git a/community/server/src/main/java/org/neo4j/server/web/WebServer.java b/community/server/src/main/java/org/neo4j/server/web/WebServer.java index a0519ef725585..3b03bc6679479 100644 --- a/community/server/src/main/java/org/neo4j/server/web/WebServer.java +++ b/community/server/src/main/java/org/neo4j/server/web/WebServer.java @@ -59,8 +59,9 @@ public interface WebServer void addJAXRSClasses( List classNames, String serverMountPoint, Collection> injectables ); void removeJAXRSClasses( List classNames, String serverMountPoint ); - void addFilter(Filter filter, String pathSpec); - void removeFilter(Filter filter, String pathSpec); + void addFilter( Filter filter, String pathSpec ); + + void removeFilter( Filter filter, String pathSpec ); void addStaticContent( String contentLocation, String serverMountPoint ); void removeStaticContent( String contentLocation, String serverMountPoint ); diff --git a/community/server/src/test/java/org/dummy/web/service/DummyThirdPartyWebService.java b/community/server/src/test/java/org/dummy/web/service/DummyThirdPartyWebService.java index 846b8ee08aab8..4751a36fe38f5 100644 --- a/community/server/src/test/java/org/dummy/web/service/DummyThirdPartyWebService.java +++ b/community/server/src/test/java/org/dummy/web/service/DummyThirdPartyWebService.java @@ -50,11 +50,11 @@ public Response sayHello() } @GET - @Path("/{something}/{somethingElse}") + @Path( "/{something}/{somethingElse}" ) @Produces( MediaType.TEXT_PLAIN ) public Response forSecurityTesting() { - return Response.ok().entity("you've reached a dummy service").build(); + return Response.ok().entity( "you've reached a dummy service" ).build(); } @GET @@ -62,11 +62,9 @@ public Response forSecurityTesting() @Produces( MediaType.TEXT_PLAIN ) public Response countNodes( @Context GraphDatabaseService db ) { - try (Transaction transaction = db.beginTx()) + try ( Transaction transaction = db.beginTx() ) { - return Response.ok() - .entity( String.valueOf( countNodesIn( db ) ) ) - .build(); + return Response.ok().entity( String.valueOf( countNodesIn( db ) ) ).build(); } } @@ -80,10 +78,9 @@ public Response authHeader( @Context HttpHeaders headers ) while ( headerIt.hasNext() ) { Map.Entry> header = headerIt.next(); - if (header.getValue().size() != 1) + if ( header.getValue().size() != 1 ) { - throw new IllegalArgumentException( "Mutlivalued header: " - + header.getKey() ); + throw new IllegalArgumentException( "Mutlivalued header: " + header.getKey() ); } theEntity.append( "\"" ).append( header.getKey() ).append( "\":\"" ) .append( header.getValue().get( 0 ) ).append( "\"" ); diff --git a/community/server/src/test/java/org/neo4j/server/LegacyIndexIT.java b/community/server/src/test/java/org/neo4j/server/LegacyIndexIT.java index a6808b3c6d06e..f10ce9a34d68e 100644 --- a/community/server/src/test/java/org/neo4j/server/LegacyIndexIT.java +++ b/community/server/src/test/java/org/neo4j/server/LegacyIndexIT.java @@ -40,7 +40,7 @@ import static org.neo4j.server.helpers.CommunityServerBuilder.server; import static org.neo4j.test.server.HTTP.RawPayload.quotedJson; -@RunWith(Theories.class) +@RunWith( Theories.class ) public class LegacyIndexIT extends ExclusiveServerTestBase { private CommunityNeoServer server; @@ -67,19 +67,19 @@ public void startServer() throws NoSuchAlgorithmException, KeyManagementExceptio } @Theory - public void shouldRejectIndexValueLargerThanConfiguredSize(String uniqueness) throws Exception + public void shouldRejectIndexValueLargerThanConfiguredSize( String uniqueness ) throws Exception { //Given server.start(); // When - String nodeURI = HTTP.POST( server.baseUri().toString() + "db/data/node").header( "Location" ); + String nodeURI = HTTP.POST( server.baseUri().toString() + "db/data/node" ).header( "Location" ); Random r = new Random(); String value = ""; for ( int i = 0; i < 6_000; i++ ) { - value += (char)(r.nextInt(26) + 'a'); + value += (char) (r.nextInt( 26 ) + 'a'); } HTTP.Response response = HTTP.POST( server.baseUri().toString() + "db/data/index/node/favorites?uniqueness=" + uniqueness, @@ -90,19 +90,19 @@ public void shouldRejectIndexValueLargerThanConfiguredSize(String uniqueness) th } @Theory - public void shouldNotRejectIndexValueThatIsJustSmallerThanConfiguredSize(String uniqueness) throws Exception + public void shouldNotRejectIndexValueThatIsJustSmallerThanConfiguredSize( String uniqueness ) throws Exception { //Given server.start(); // When - String nodeURI = HTTP.POST( server.baseUri().toString() + "db/data/node").header( "Location" ); + String nodeURI = HTTP.POST( server.baseUri().toString() + "db/data/node" ).header( "Location" ); Random r = new Random(); String value = ""; for ( int i = 0; i < 4_000; i++ ) { - value += (char)(r.nextInt(26) + 'a'); + value += (char) (r.nextInt( 26 ) + 'a'); } HTTP.Response response = HTTP.POST( server.baseUri().toString() + "db/data/index/node/favorites?uniqueness=" + uniqueness, diff --git a/community/server/src/test/java/org/neo4j/server/NeoServerStartupLoggingIT.java b/community/server/src/test/java/org/neo4j/server/NeoServerStartupLoggingIT.java index 3d22a37cda42b..15b1d3b0a0ebc 100644 --- a/community/server/src/test/java/org/neo4j/server/NeoServerStartupLoggingIT.java +++ b/community/server/src/test/java/org/neo4j/server/NeoServerStartupLoggingIT.java @@ -74,7 +74,7 @@ public void shouldLogStartup() throws Exception // Check the server is alive Client nonRedirectingClient = Client.create(); nonRedirectingClient.setFollowRedirects( false ); - final JaxRsResponse response = new RestRequest(server.baseUri(), nonRedirectingClient).get(); + final JaxRsResponse response = new RestRequest( server.baseUri(), nonRedirectingClient ).get(); assertThat( response.getStatus(), is( greaterThan( 199 ) ) ); } diff --git a/community/server/src/test/java/org/neo4j/server/ServerConfigIT.java b/community/server/src/test/java/org/neo4j/server/ServerConfigIT.java index 8caa7153a46f5..c0cc1f2e685a8 100644 --- a/community/server/src/test/java/org/neo4j/server/ServerConfigIT.java +++ b/community/server/src/test/java/org/neo4j/server/ServerConfigIT.java @@ -19,12 +19,12 @@ */ package org.neo4j.server; -import java.io.IOException; -import javax.ws.rs.core.MediaType; - import org.junit.After; import org.junit.Test; +import java.io.IOException; +import javax.ws.rs.core.MediaType; + import org.neo4j.helpers.ListenSocketAddress; import org.neo4j.server.configuration.ServerSettings; import org.neo4j.server.rest.JaxRsResponse; @@ -36,7 +36,6 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; - import static org.neo4j.server.helpers.CommunityServerBuilder.server; import static org.neo4j.test.server.HTTP.POST; @@ -197,7 +196,7 @@ public void shouldHaveSandboxingEnabledByDefault() throws Exception * * This at least lets us know that the configuration attribute gets picked up and used. */ - @Test(expected = RuntimeException.class) + @Test( expected = RuntimeException.class ) public void shouldBeAbleToDisableSandboxing() throws Exception { // NOTE: This has to be initialized to sandboxed, because it can only be initialized once per JVM session, diff --git a/community/server/src/test/java/org/neo4j/server/ServerTestUtils.java b/community/server/src/test/java/org/neo4j/server/ServerTestUtils.java index 6614c65ae71ac..61d4fedabd79c 100644 --- a/community/server/src/test/java/org/neo4j/server/ServerTestUtils.java +++ b/community/server/src/test/java/org/neo4j/server/ServerTestUtils.java @@ -184,7 +184,7 @@ public static File createTempConfigFile( File parentDir ) throws IOException public interface BlockWithCSVFileURL { - void execute(String url) throws Exception; + void execute( String url ) throws Exception; } public static void withCSVFile( int rowCount, BlockWithCSVFileURL block ) throws Exception @@ -194,7 +194,7 @@ public static void withCSVFile( int rowCount, BlockWithCSVFileURL block ) throws { try ( PrintWriter writer = new PrintWriter( file ) ) { - for (int i = 0; i < rowCount; ++i) + for ( int i = 0; i < rowCount; ++i ) { writer.println("1,2,3"); } diff --git a/community/server/src/test/java/org/neo4j/server/TransactionTimeoutIT.java b/community/server/src/test/java/org/neo4j/server/TransactionTimeoutIT.java index 63824b9a8ee74..ea0ea5d723def 100644 --- a/community/server/src/test/java/org/neo4j/server/TransactionTimeoutIT.java +++ b/community/server/src/test/java/org/neo4j/server/TransactionTimeoutIT.java @@ -19,21 +19,19 @@ */ package org.neo4j.server; -import java.util.List; -import java.util.Map; - import org.junit.After; import org.junit.Test; +import java.util.List; +import java.util.Map; + import org.neo4j.server.configuration.ServerSettings; import org.neo4j.test.server.ExclusiveServerTestBase; import org.neo4j.test.server.HTTP; import static java.util.Arrays.asList; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; - import static org.neo4j.helpers.collection.MapUtil.map; import static org.neo4j.kernel.api.exceptions.Status.Transaction.TransactionNotFound; import static org.neo4j.server.helpers.CommunityServerBuilder.server; @@ -62,7 +60,7 @@ public void shouldHonorReallyLowSessionTimeout() throws Exception Map response = HTTP.POST( tx + "/commit" ).content(); // Then - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) List> errors = (List>) response.get( "errors" ); assertThat( errors.get( 0 ).get( "code" ), equalTo( TransactionNotFound.code().serialize() ) ); } diff --git a/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java b/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java index be44e2c6c09e4..7a8426a9bd91b 100644 --- a/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java +++ b/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java @@ -194,8 +194,10 @@ private Map createConfiguration( File temporaryFolder ) properties.put( httpsConnector.encryption.name(), "TLS" ); properties.put( GraphDatabaseSettings.auth_enabled.name(), "false" ); - properties.put( ServerSettings.certificates_directory.name(), new File(temporaryFolder, "certificates").getAbsolutePath() ); - properties.put( GraphDatabaseSettings.logs_directory.name(), new File(temporaryFolder, "logs").getAbsolutePath() ); + properties.put( ServerSettings.certificates_directory.name(), + new File( temporaryFolder, "certificates" ).getAbsolutePath() ); + properties.put( GraphDatabaseSettings.logs_directory.name(), + new File( temporaryFolder, "logs" ).getAbsolutePath() ); properties.put( GraphDatabaseSettings.pagecache_memory.name(), "8m" ); for ( Object key : arbitraryProperties.keySet() ) diff --git a/community/server/src/test/java/org/neo4j/server/helpers/FunctionalTestHelper.java b/community/server/src/test/java/org/neo4j/server/helpers/FunctionalTestHelper.java index e28c36069f5e7..25e213c8aa8d8 100644 --- a/community/server/src/test/java/org/neo4j/server/helpers/FunctionalTestHelper.java +++ b/community/server/src/test/java/org/neo4j/server/helpers/FunctionalTestHelper.java @@ -53,7 +53,7 @@ public FunctionalTestHelper( NeoServer server ) } this.helper = new GraphDbHelper( server.getDatabase() ); this.server = server; - this.request = new RestRequest(server.baseUri().resolve("db/data/")); + this.request = new RestRequest( server.baseUri().resolve( "db/data/" ) ); } public static Matcher arrayContains( final String element ) @@ -197,9 +197,9 @@ public String extensionUri() return dataUri() + "ext"; } - public JaxRsResponse get(String path) + public JaxRsResponse get( String path ) { - return request.get(path); + return request.get( path ); } public long getNodeIdFromUri( String nodeUri ) diff --git a/community/server/src/test/java/org/neo4j/server/modules/ManagementApiModuleTest.java b/community/server/src/test/java/org/neo4j/server/modules/ManagementApiModuleTest.java index 6b3b3ab00b17e..58f2a74241e41 100644 --- a/community/server/src/test/java/org/neo4j/server/modules/ManagementApiModuleTest.java +++ b/community/server/src/test/java/org/neo4j/server/modules/ManagementApiModuleTest.java @@ -19,13 +19,13 @@ */ package org.neo4j.server.modules; +import org.junit.Test; + import java.net.URI; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; - import org.neo4j.kernel.configuration.Config; import org.neo4j.server.CommunityNeoServer; import org.neo4j.server.configuration.ServerSettings; @@ -56,7 +56,7 @@ public void shouldRegisterASingleUri() throws Exception when( neoServer.getConfig() ).thenReturn( config ); - ManagementApiModule module = new ManagementApiModule(webServer, config ); + ManagementApiModule module = new ManagementApiModule( webServer, config ); module.start(); verify( webServer ).addJAXRSClasses( any( List.class ), anyString(), anyCollection() ); diff --git a/community/server/src/test/java/org/neo4j/server/modules/ThirdPartyJAXRSModuleTest.java b/community/server/src/test/java/org/neo4j/server/modules/ThirdPartyJAXRSModuleTest.java index f24ae2af259ef..a85ff9d8e7e5f 100644 --- a/community/server/src/test/java/org/neo4j/server/modules/ThirdPartyJAXRSModuleTest.java +++ b/community/server/src/test/java/org/neo4j/server/modules/ThirdPartyJAXRSModuleTest.java @@ -60,7 +60,8 @@ public void shouldReportThirdPartyPackagesAtSpecifiedMount() throws Exception when( config.get( ServerSettings.third_party_packages ) ).thenReturn( jaxRsPackages ); // When - ThirdPartyJAXRSModule module = new ThirdPartyJAXRSModule(webServer, config, NullLogProvider.getInstance(), neoServer ); + ThirdPartyJAXRSModule module = + new ThirdPartyJAXRSModule( webServer, config, NullLogProvider.getInstance(), neoServer ); module.start(); // Then diff --git a/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java b/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java index 3ca05691a9927..16858a6189248 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java +++ b/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java @@ -187,7 +187,7 @@ protected Node[] getNodes( String... names ) { Node[] nodes = {}; ArrayList result = new ArrayList<>(); - for (String name : names) + for ( String name : names ) { result.add( getNode( name ) ); } diff --git a/community/server/src/test/java/org/neo4j/server/rest/BatchOperationIT.java b/community/server/src/test/java/org/neo4j/server/rest/BatchOperationIT.java index 6f2720a74f406..39d5eb07e992f 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/BatchOperationIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/BatchOperationIT.java @@ -66,7 +66,7 @@ public class BatchOperationIT extends AbstractRestFunctionalDocTestBase "image::batch-request-api.png[]" ) @SuppressWarnings( "unchecked" ) @Test - @Graph("Joe knows John") + @Graph( "Joe knows John" ) public void shouldPerformMultipleOperations() throws Exception { long idJoe = data.get().get( "Joe" ).getId(); @@ -310,7 +310,7 @@ public void shouldRollbackAllWhenGivenIncorrectRequest() throws ClientHandlerExc } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldHandleUnicodeGetCorrectly() throws Exception { String asianText = "\u4f8b\u5b50"; @@ -380,7 +380,7 @@ public void shouldHandleFailingCypherStatementCorrectly() throws Exception } @Test - @Graph("Peter likes Jazz") + @Graph( "Peter likes Jazz" ) public void shouldHandleEscapedStrings() throws ClientHandlerException, UniformInterfaceException, JSONException, JsonParseException { diff --git a/community/server/src/test/java/org/neo4j/server/rest/GetOnRootIT.java b/community/server/src/test/java/org/neo4j/server/rest/GetOnRootIT.java index f8e1057c9bac9..519b3c171c0ca 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/GetOnRootIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/GetOnRootIT.java @@ -19,10 +19,10 @@ */ package org.neo4j.server.rest; -import java.util.Map; - import org.junit.Test; +import java.util.Map; + import org.neo4j.kernel.impl.annotations.Documented; import org.neo4j.kernel.internal.Version; import org.neo4j.server.rest.RESTRequestGenerator.ResponseEntity; @@ -32,18 +32,17 @@ import org.neo4j.test.TestData.Title; import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; public class GetOnRootIT extends AbstractRestFunctionalTestBase { - @Title("Get service root") + @Title( "Get service root" ) @Documented( "The service root is your starting point to discover the REST API. It contains the basic starting " + "points for the database, and some version and extension information." ) @Test - @Graph("I know you") + @Graph( "I know you" ) public void assert200OkFromGet() throws Exception { String body = gen.get().expectedStatus( 200 ).get( getDataUri() ).entity(); diff --git a/community/server/src/test/java/org/neo4j/server/rest/LabelsIT.java b/community/server/src/test/java/org/neo4j/server/rest/LabelsIT.java index ae9a7a180ed9f..dbb1245d67634 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/LabelsIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/LabelsIT.java @@ -110,7 +110,7 @@ public void adding_an_invalid_label_to_a_node() throws PropertyValueException "request body." ) @Test @GraphDescription.Graph( nodes = { @NODE( name = "Clint Eastwood", setNameProperty = true, - labels = { @LABEL( "Person" ) }) } ) + labels = {@LABEL( "Person" )} )} ) public void replacing_labels_on_a_node() throws PropertyValueException { Map nodes = data.get(); @@ -138,7 +138,7 @@ public void listing_node_labels() throws JsonParseException .expectedStatus( 200 ) .get( nodeUri + "/labels" ) .entity(); - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) List labels = (List) readJson( body ); assertEquals( asSet( "Actor", "Director" ), Iterables.asSet( labels ) ); } @@ -208,12 +208,11 @@ public void get_all_nodes_with_label() throws JsonParseException "index is available, all nodes with the given label will be filtered through to find matching nodes.\n" + "\n" + "Currently, it is not possible to search using multiple properties." ) - @GraphDescription.Graph( nodes = { - @NODE( name = "Donald Sutherland", labels = { @LABEL( "Person" )} ), - @NODE( name = "Clint Eastwood", labels = { @LABEL( "Person" )}, properties = { @PROP( key = "name", - value = "Clint Eastwood" )}), - @NODE( name = "Steven Spielberg", labels = { @LABEL( "Person" )}, properties = { @PROP( key = "name", - value = "Steven Spielberg" )})}) + @GraphDescription.Graph( nodes = {@NODE( name = "Donald Sutherland", labels = {@LABEL( "Person" )} ), + @NODE( name = "Clint Eastwood", labels = {@LABEL( "Person" )}, properties = { + @PROP( key = "name", value = "Clint Eastwood" )} ), + @NODE( name = "Steven Spielberg", labels = {@LABEL( "Person" )}, properties = { + @PROP( key = "name", value = "Steven Spielberg" )} )} ) public void get_nodes_with_label_and_property() throws JsonParseException, UnsupportedEncodingException { data.get(); @@ -231,12 +230,11 @@ public void get_nodes_with_label_and_property() throws JsonParseException, Unsup @Test @Documented( "Get nodes by label and array property." ) - @GraphDescription.Graph( nodes = { - @NODE(name = "Donald Sutherland", labels = {@LABEL("Person")}), - @NODE(name = "Clint Eastwood", labels = {@LABEL("Person")}, properties = - {@PROP(key = "names", value = "Clint,Eastwood", type = ARRAY, componentType = STRING)}), - @NODE(name = "Steven Spielberg", labels = {@LABEL("Person")}, properties = - {@PROP(key = "names", value = "Steven,Spielberg", type = ARRAY, componentType = STRING)})}) + @GraphDescription.Graph( nodes = {@NODE( name = "Donald Sutherland", labels = {@LABEL( "Person" )} ), + @NODE( name = "Clint Eastwood", labels = {@LABEL( "Person" )}, properties = { + @PROP( key = "names", value = "Clint,Eastwood", type = ARRAY, componentType = STRING )} ), + @NODE( name = "Steven Spielberg", labels = {@LABEL( "Person" )}, properties = { + @PROP( key = "names", value = "Steven,Spielberg", type = ARRAY, componentType = STRING )} )} ) public void get_nodes_with_label_and_array_property() throws JsonParseException, UnsupportedEncodingException { data.get(); diff --git a/community/server/src/test/java/org/neo4j/server/rest/ManageNodeIT.java b/community/server/src/test/java/org/neo4j/server/rest/ManageNodeIT.java index 15a2b92e6a0ac..4c94fb47163e5 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/ManageNodeIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/ManageNodeIT.java @@ -177,7 +177,7 @@ public void shouldGet400WhenCreatingNodeUnsupportedNestedPropertyValues() throws assertEquals( 400, response.getStatus() ); } - private JaxRsResponse sendCreateRequestToServer(final String json) + private JaxRsResponse sendCreateRequestToServer( final String json ) { return RestRequest.req().post( functionalTestHelper.dataUri() + "node/" , json ); } @@ -307,7 +307,7 @@ public void shouldRespondWith400IfInvalidJsonSentAsNodeProperties() throws URISy response.close(); } - private JaxRsResponse sendDeleteRequestToServer(final long id) throws Exception + private JaxRsResponse sendDeleteRequestToServer( final long id ) throws Exception { return RestRequest.req().delete(functionalTestHelper.dataUri() + "node/" + id); } @@ -593,8 +593,8 @@ public void shouldAdvertiseServicesWhenAsked() throws Exception when( uriInfo.getBaseUri() ).thenReturn( uri ); RootService svc = new RootService( new CommunityNeoServer( Config.embeddedDefaults( stringMap( - new HttpConnector("http", Encryption.NONE).type.name(), "HTTP", - new HttpConnector("http", Encryption.NONE).enabled.name(), "true" + new HttpConnector( "http", Encryption.NONE ).type.name(), "HTTP", + new HttpConnector( "http", Encryption.NONE ).enabled.name(), "true" ) ), GraphDatabaseDependencies.newDependencies().userLogProvider( NullLogProvider.getInstance() ) .monitors( new Monitors() ), diff --git a/community/server/src/test/java/org/neo4j/server/rest/RESTRequestGenerator.java b/community/server/src/test/java/org/neo4j/server/rest/RESTRequestGenerator.java index d29c3b22ea7ca..8a4ba0db5e79b 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/RESTRequestGenerator.java +++ b/community/server/src/test/java/org/neo4j/server/rest/RESTRequestGenerator.java @@ -96,7 +96,7 @@ public RESTRequestGenerator expectedStatus( final int expectedResponseStatus ) * * @param expectedStatus the expected response status */ - public RESTRequestGenerator expectedStatus( final ClientResponse.Status expectedStatus) + public RESTRequestGenerator expectedStatus( final ClientResponse.Status expectedStatus ) { this.expectedResponseStatus = expectedStatus.getStatusCode(); return this; @@ -258,8 +258,7 @@ private ResponseEntity retrieveResponseFromRequest( final String method, final S } else { - request = withHeaders(REQUEST_BUILDER).accept( accept ) - .build(new URI(uri), method); + request = withHeaders( REQUEST_BUILDER ).accept( accept ).build( new URI( uri ), method ); } } catch ( URISyntaxException e ) @@ -269,9 +268,9 @@ private ResponseEntity retrieveResponseFromRequest( final String method, final S return retrieveResponse( uri, responseCode, accept, headerFields, request ); } - private T withHeaders(T builder) + private T withHeaders( T builder ) { - for (Entry entry : addedRequestHeaders.entrySet()) + for ( Entry entry : addedRequestHeaders.entrySet() ) { builder.header(entry.getKey(),entry.getValue()); } @@ -371,7 +370,7 @@ public static class ResponseEntity public ResponseEntity( ClientResponse response, String entity ) { - this.response = new JaxRsResponse(response,entity); + this.response = new JaxRsResponse( response, entity ); this.entity = entity; } diff --git a/community/server/src/test/java/org/neo4j/server/rest/RedirectorIT.java b/community/server/src/test/java/org/neo4j/server/rest/RedirectorIT.java index b180a7a81ffdb..e23f3f99efb7e 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/RedirectorIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/RedirectorIT.java @@ -30,7 +30,7 @@ public class RedirectorIT extends AbstractRestFunctionalTestBase @Test public void shouldRedirectRootToBrowser() throws Exception { - JaxRsResponse response = new RestRequest(server().baseUri()).get(); + JaxRsResponse response = new RestRequest( server().baseUri() ).get(); assertThat(response.getStatus(), is(not(404))); } @@ -38,7 +38,7 @@ public void shouldRedirectRootToBrowser() throws Exception @Test public void shouldNotRedirectTheRestOfTheWorld() throws Exception { - JaxRsResponse response = new RestRequest(server().baseUri()).get("a/different/relative/data/uri/"); + JaxRsResponse response = new RestRequest( server().baseUri() ).get( "a/different/relative/data/uri/" ); assertThat(response.getStatus(), is(404)); } diff --git a/community/server/src/test/java/org/neo4j/server/rest/RelationshipIT.java b/community/server/src/test/java/org/neo4j/server/rest/RelationshipIT.java index ba5f8918ad9ca..f7b3d042999d4 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/RelationshipIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/RelationshipIT.java @@ -19,13 +19,13 @@ */ package org.neo4j.server.rest; -import java.io.IOException; -import javax.ws.rs.core.Response.Status; - import com.sun.jersey.api.client.ClientResponse; import org.junit.BeforeClass; import org.junit.Test; +import java.io.IOException; +import javax.ws.rs.core.Response.Status; + import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; @@ -47,7 +47,6 @@ import static org.hamcrest.core.IsNot.not; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; - import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; @@ -62,11 +61,11 @@ public static void setupServer() throws IOException } @Test - @Title("Remove properties from a relationship") - @Graph(nodes = {@NODE(name = "Romeo", setNameProperty = true), - @NODE(name = "Juliet", setNameProperty = true)}, relationships = {@REL(start = "Romeo", end = "Juliet", - type = "LOVES", properties = {@PROP(key = "cost", value = "high", type = GraphDescription.PropType - .STRING)})}) + @Title( "Remove properties from a relationship" ) + @Graph( nodes = {@NODE( name = "Romeo", setNameProperty = true ), + @NODE( name = "Juliet", setNameProperty = true )}, relationships = { + @REL( start = "Romeo", end = "Juliet", type = "LOVES", properties = { + @PROP( key = "cost", value = "high", type = GraphDescription.PropType.STRING )} )} ) public void shouldReturn204WhenPropertiesAreRemovedFromRelationship() { Relationship loves = getFirstRelationshipFromRomeoNode(); @@ -75,7 +74,7 @@ public void shouldReturn204WhenPropertiesAreRemovedFromRelationship() } @Test - @Graph("I know you") + @Graph( "I know you" ) public void get_Relationship_by_ID() throws JsonParseException { Node node = data.get().get( "I" ); @@ -93,12 +92,12 @@ public void get_Relationship_by_ID() throws JsonParseException } @Test - @Title("Remove property from a relationship") + @Title( "Remove property from a relationship" ) @Documented( "See the example request below." ) - @Graph(nodes = {@NODE(name = "Romeo", setNameProperty = true), - @NODE(name = "Juliet", setNameProperty = true)}, relationships = {@REL(start = "Romeo", end = "Juliet", - type = "LOVES", properties = {@PROP(key = "cost", value = "high", type = GraphDescription.PropType - .STRING)})}) + @Graph( nodes = {@NODE( name = "Romeo", setNameProperty = true ), + @NODE( name = "Juliet", setNameProperty = true )}, relationships = { + @REL( start = "Romeo", end = "Juliet", type = "LOVES", properties = { + @PROP( key = "cost", value = "high", type = GraphDescription.PropType.STRING )} )} ) public void shouldReturn204WhenPropertyIsRemovedFromRelationship() { data.get(); @@ -109,12 +108,12 @@ public void shouldReturn204WhenPropertyIsRemovedFromRelationship() } @Test - @Title("Remove non-existent property from a relationship") + @Title( "Remove non-existent property from a relationship" ) @Documented( "Attempting to remove a property that doesn't exist results in an error." ) - @Graph(nodes = {@NODE(name = "Romeo", setNameProperty = true), - @NODE(name = "Juliet", setNameProperty = true)}, relationships = {@REL(start = "Romeo", end = "Juliet", - type = "LOVES", properties = {@PROP(key = "cost", value = "high", type = GraphDescription.PropType - .STRING)})}) + @Graph( nodes = {@NODE( name = "Romeo", setNameProperty = true ), + @NODE( name = "Juliet", setNameProperty = true )}, relationships = { + @REL( start = "Romeo", end = "Juliet", type = "LOVES", properties = { + @PROP( key = "cost", value = "high", type = GraphDescription.PropType.STRING )} )} ) public void shouldReturn404WhenPropertyWhichDoesNotExistRemovedFromRelationship() { data.get(); @@ -124,10 +123,10 @@ public void shouldReturn404WhenPropertyWhichDoesNotExistRemovedFromRelationship( } @Test - @Graph(nodes = {@NODE(name = "Romeo", setNameProperty = true), - @NODE(name = "Juliet", setNameProperty = true)}, relationships = {@REL(start = "Romeo", end = "Juliet", - type = "LOVES", properties = {@PROP(key = "cost", value = "high", type = GraphDescription.PropType - .STRING)})}) + @Graph( nodes = {@NODE( name = "Romeo", setNameProperty = true ), + @NODE( name = "Juliet", setNameProperty = true )}, relationships = { + @REL( start = "Romeo", end = "Juliet", type = "LOVES", properties = { + @PROP( key = "cost", value = "high", type = GraphDescription.PropType.STRING )} )} ) public void shouldReturn404WhenPropertyWhichDoesNotExistRemovedFromRelationshipStreaming() { data.get(); @@ -166,11 +165,11 @@ public void shouldReturn404WhenPropertyRemovedFromARelationshipWhichDoesNotExist } @Test - @Graph(nodes = {@NODE(name = "Romeo", setNameProperty = true), - @NODE(name = "Juliet", setNameProperty = true)}, relationships = {@REL(start = "Romeo", end = "Juliet", - type = "LOVES", properties = {@PROP(key = "cost", value = "high", type = GraphDescription.PropType - .STRING)})}) - @Title("Delete relationship") + @Graph( nodes = {@NODE( name = "Romeo", setNameProperty = true ), + @NODE( name = "Juliet", setNameProperty = true )}, relationships = { + @REL( start = "Romeo", end = "Juliet", type = "LOVES", properties = { + @PROP( key = "cost", value = "high", type = GraphDescription.PropType.STRING )} )} ) + @Title( "Delete relationship" ) public void removeRelationship() { data.get(); @@ -181,10 +180,10 @@ public void removeRelationship() } @Test - @Graph(nodes = {@NODE(name = "Romeo", setNameProperty = true), - @NODE(name = "Juliet", setNameProperty = true)}, relationships = {@REL(start = "Romeo", end = "Juliet", - type = "LOVES", properties = {@PROP(key = "cost", value = "high", type = GraphDescription.PropType - .STRING)})}) + @Graph( nodes = {@NODE( name = "Romeo", setNameProperty = true ), + @NODE( name = "Juliet", setNameProperty = true )}, relationships = { + @REL( start = "Romeo", end = "Juliet", type = "LOVES", properties = { + @PROP( key = "cost", value = "high", type = GraphDescription.PropType.STRING )} )} ) public void get_single_property_on_a_relationship() throws Exception { Relationship loves = getFirstRelationshipFromRomeoNode(); @@ -199,10 +198,10 @@ private String getRelPropURI( Relationship loves, String propertyKey ) } @Test - @Graph(nodes = {@NODE(name = "Romeo", setNameProperty = true), - @NODE(name = "Juliet", setNameProperty = true)}, relationships = {@REL(start = "Romeo", end = "Juliet", - type = "LOVES", properties = {@PROP(key = "cost", value = "high", type = GraphDescription.PropType - .STRING)})}) + @Graph( nodes = {@NODE( name = "Romeo", setNameProperty = true ), + @NODE( name = "Juliet", setNameProperty = true )}, relationships = { + @REL( start = "Romeo", end = "Juliet", type = "LOVES", properties = { + @PROP( key = "cost", value = "high", type = GraphDescription.PropType.STRING )} )} ) public void set_single_property_on_a_relationship() throws Exception { Relationship loves = getFirstRelationshipFromRomeoNode(); @@ -213,10 +212,11 @@ public void set_single_property_on_a_relationship() throws Exception } @Test - @Graph(nodes = {@NODE(name = "Romeo", setNameProperty = true), - @NODE(name = "Juliet", setNameProperty = true)}, relationships = {@REL(start = "Romeo", end = "Juliet", - type = "LOVES", properties = {@PROP(key = "cost", value = "high", type = GraphDescription.PropType - .STRING), @PROP(key = "since", value = "1day", type = GraphDescription.PropType.STRING)})}) + @Graph( nodes = {@NODE( name = "Romeo", setNameProperty = true ), + @NODE( name = "Juliet", setNameProperty = true )}, relationships = { + @REL( start = "Romeo", end = "Juliet", type = "LOVES", properties = { + @PROP( key = "cost", value = "high", type = GraphDescription.PropType.STRING ), + @PROP( key = "since", value = "1day", type = GraphDescription.PropType.STRING )} )} ) public void set_all_properties_on_a_relationship() throws Exception { Relationship loves = getFirstRelationshipFromRomeoNode(); @@ -228,10 +228,11 @@ public void set_all_properties_on_a_relationship() throws Exception } @Test - @Graph(nodes = {@NODE(name = "Romeo", setNameProperty = true), - @NODE(name = "Juliet", setNameProperty = true)}, relationships = {@REL(start = "Romeo", end = "Juliet", - type = "LOVES", properties = {@PROP(key = "cost", value = "high", type = GraphDescription.PropType - .STRING), @PROP(key = "since", value = "1day", type = GraphDescription.PropType.STRING)})}) + @Graph( nodes = {@NODE( name = "Romeo", setNameProperty = true ), + @NODE( name = "Juliet", setNameProperty = true )}, relationships = { + @REL( start = "Romeo", end = "Juliet", type = "LOVES", properties = { + @PROP( key = "cost", value = "high", type = GraphDescription.PropType.STRING ), + @PROP( key = "since", value = "1day", type = GraphDescription.PropType.STRING )} )} ) public void get_all_properties_on_a_relationship() throws Exception { Relationship loves = getFirstRelationshipFromRomeoNode(); diff --git a/community/server/src/test/java/org/neo4j/server/rest/RemoveNodePropertiesIT.java b/community/server/src/test/java/org/neo4j/server/rest/RemoveNodePropertiesIT.java index ac5efb30a8cfc..85043b221e53c 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/RemoveNodePropertiesIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/RemoveNodePropertiesIT.java @@ -81,7 +81,7 @@ public void shouldReturn404WhenPropertiesSentToANodeWhichDoesNotExist() response.close(); } - private JaxRsResponse removeNodePropertiesOnServer(final long nodeId) + private JaxRsResponse removeNodePropertiesOnServer( final long nodeId ) { return RestRequest.req().delete(getPropertiesUri(nodeId)); } @@ -123,7 +123,7 @@ private String getPropertyUri( final long nodeId, final String key ) return functionalTestHelper.nodePropertyUri( nodeId, key ); } - private JaxRsResponse removeNodePropertyOnServer(final long nodeId, final String key) + private JaxRsResponse removeNodePropertyOnServer( final long nodeId, final String key ) { return RestRequest.req().delete(getPropertyUri(nodeId, key)); } diff --git a/community/server/src/test/java/org/neo4j/server/rest/RemoveRelationshipIT.java b/community/server/src/test/java/org/neo4j/server/rest/RemoveRelationshipIT.java index 0c261a734437d..2ae4e52438728 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/RemoveRelationshipIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/RemoveRelationshipIT.java @@ -19,12 +19,12 @@ */ package org.neo4j.server.rest; -import java.io.IOException; -import java.net.URI; - import org.junit.BeforeClass; import org.junit.Test; +import java.io.IOException; +import java.net.URI; + import org.neo4j.server.helpers.FunctionalTestHelper; import org.neo4j.server.rest.domain.GraphDbHelper; @@ -47,7 +47,7 @@ public void shouldGet204WhenRemovingAValidRelationship() throws Exception { long relationshipId = helper.createRelationship( "KNOWS" ); - JaxRsResponse response = sendDeleteRequest(new URI(functionalTestHelper.relationshipUri(relationshipId))); + JaxRsResponse response = sendDeleteRequest( new URI( functionalTestHelper.relationshipUri( relationshipId ) ) ); assertEquals( 204, response.getStatus() ); response.close(); @@ -59,13 +59,13 @@ public void shouldGet404WhenRemovingAnInvalidRelationship() throws Exception long relationshipId = helper.createRelationship( "KNOWS" ); JaxRsResponse response = sendDeleteRequest(new URI( - functionalTestHelper.relationshipUri((relationshipId + 1) * 9999))); + functionalTestHelper.relationshipUri( (relationshipId + 1) * 9999 ) ) ); assertEquals( 404, response.getStatus() ); response.close(); } - private JaxRsResponse sendDeleteRequest(URI requestUri) + private JaxRsResponse sendDeleteRequest( URI requestUri ) { return RestRequest.req().delete(requestUri); } diff --git a/community/server/src/test/java/org/neo4j/server/rest/SetNodePropertiesIT.java b/community/server/src/test/java/org/neo4j/server/rest/SetNodePropertiesIT.java index 09c024c676e78..6be11c65dab7f 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/SetNodePropertiesIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/SetNodePropertiesIT.java @@ -116,7 +116,7 @@ private URI getPropertyUri( Node node, String key ) throws Exception "Note that a single value are submitted not as a map but just as a value\n" + "(which is valid JSON) like in the example\n" + "below." ) - @Graph( nodes = {@NODE(name = "jim", properties = {@PROP(key = "foo2", value = "bar2")})} ) + @Graph( nodes = {@NODE( name = "jim", properties = {@PROP( key = "foo2", value = "bar2" )} )} ) @Test public void shouldReturn204WhenPropertyIsSet() throws Exception { diff --git a/community/server/src/test/java/org/neo4j/server/rest/SetRelationshipPropertiesIT.java b/community/server/src/test/java/org/neo4j/server/rest/SetRelationshipPropertiesIT.java index eefa4e8b354dc..c3ae6fb5aab6d 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/SetRelationshipPropertiesIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/SetRelationshipPropertiesIT.java @@ -103,12 +103,12 @@ public void shouldReturn404WhenPropertiesSentToANodeWhichDoesNotExist() throws J response.close(); } - private JaxRsResponse updatePropertiesOnServer(final Map map) throws JsonParseException + private JaxRsResponse updatePropertiesOnServer( final Map map ) throws JsonParseException { return RestRequest.req().put(propertiesUri.toString(), JsonHelper.createJsonFrom(map)); } - private String getPropertyUri(final String key) throws Exception + private String getPropertyUri( final String key ) throws Exception { return propertiesUri.toString() + "/" + key ; } @@ -145,7 +145,7 @@ public void shouldReturn404WhenPropertySentToANodeWhichDoesNotExist() throws Exc response.close(); } - private JaxRsResponse setPropertyOnServer(final String key, final Object value) throws Exception + private JaxRsResponse setPropertyOnServer( final String key, final Object value ) throws Exception { return RestRequest.req().put(getPropertyUri(key), JsonHelper.createJsonFrom(value)); } diff --git a/community/server/src/test/java/org/neo4j/server/rest/TraverserIT.java b/community/server/src/test/java/org/neo4j/server/rest/TraverserIT.java index ecff83e08db4a..2d7d2c6c3e41e 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/TraverserIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/TraverserIT.java @@ -54,7 +54,7 @@ public void shouldGet404WhenTraversingFromNonExistentNode() } @Test - @Graph( nodes = {@NODE(name = "I")} ) + @Graph( nodes = {@NODE( name = "I" )} ) public void shouldGet200WhenNoHitsFromTraversing() { assertSize( 0,gen().expectedStatus( 200 ).payload( "" ).post( diff --git a/community/server/src/test/java/org/neo4j/server/rest/batch/BatchOperationsTest.java b/community/server/src/test/java/org/neo4j/server/rest/batch/BatchOperationsTest.java index 2cdf5a388dddd..1abe313e7ae7c 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/batch/BatchOperationsTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/batch/BatchOperationsTest.java @@ -41,11 +41,11 @@ public class BatchOperationsTest { - private final BatchOperations ops = new BatchOperations(null) + private final BatchOperations ops = new BatchOperations( null ) { @Override - protected void invoke(String method, String path, String body, Integer id, - URI targetUri, InternalJettyServletRequest req, InternalJettyServletResponse res) throws IOException, ServletException + protected void invoke( String method, String path, String body, Integer id, URI targetUri, + InternalJettyServletRequest req, InternalJettyServletResponse res ) throws IOException, ServletException { } }; diff --git a/community/server/src/test/java/org/neo4j/server/rest/dbms/UserServiceTest.java b/community/server/src/test/java/org/neo4j/server/rest/dbms/UserServiceTest.java index 94c3006623398..9716ad763df67 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/dbms/UserServiceTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/dbms/UserServiceTest.java @@ -31,19 +31,19 @@ import org.neo4j.kernel.api.exceptions.InvalidArgumentsException; import org.neo4j.kernel.api.security.AuthenticationResult; +import org.neo4j.kernel.api.security.PasswordPolicy; import org.neo4j.kernel.api.security.SecurityContext; +import org.neo4j.kernel.api.security.UserManager; +import org.neo4j.kernel.api.security.UserManagerSupplier; +import org.neo4j.kernel.impl.security.Credential; +import org.neo4j.kernel.impl.security.User; import org.neo4j.server.rest.repr.OutputFormat; import org.neo4j.server.rest.repr.formats.JsonFormat; import org.neo4j.server.security.auth.AuthenticationStrategy; import org.neo4j.server.security.auth.BasicAuthManager; -import org.neo4j.server.security.auth.BasicSecurityContext; import org.neo4j.server.security.auth.BasicPasswordPolicy; -import org.neo4j.kernel.impl.security.Credential; +import org.neo4j.server.security.auth.BasicSecurityContext; import org.neo4j.server.security.auth.InMemoryUserRepository; -import org.neo4j.kernel.api.security.PasswordPolicy; -import org.neo4j.kernel.impl.security.User; -import org.neo4j.kernel.api.security.UserManager; -import org.neo4j.kernel.api.security.UserManagerSupplier; import org.neo4j.server.security.auth.UserRepository; import org.neo4j.test.server.EntityOutputFormat; @@ -57,7 +57,7 @@ public class UserServiceTest { - protected static final User NEO4J_USER = new User.Builder( "neo4j", Credential.forPassword( "neo4j" )) + protected static final User NEO4J_USER = new User.Builder( "neo4j", Credential.forPassword( "neo4j" ) ) .withRequiredPasswordChange( true ).build(); protected final PasswordPolicy passwordPolicy = new BasicPasswordPolicy(); diff --git a/community/server/src/test/java/org/neo4j/server/rest/domain/GraphDbHelper.java b/community/server/src/test/java/org/neo4j/server/rest/domain/GraphDbHelper.java index f58b4fae46fbc..6fb74ed0a2743 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/domain/GraphDbHelper.java +++ b/community/server/src/test/java/org/neo4j/server/rest/domain/GraphDbHelper.java @@ -92,7 +92,7 @@ public int getNumberOfRelationships() public Map getNodeProperties( long nodeId ) { - try (Transaction tx = database.getGraph().beginTransaction( implicit, AnonymousContext.read() )) + try ( Transaction tx = database.getGraph().beginTransaction( implicit, AnonymousContext.read() ) ) { Node node = database.getGraph().getNodeById( nodeId ); Map allProperties = node.getAllProperties(); @@ -140,7 +140,7 @@ public long createNode( Map properties, Label... labels ) public void deleteNode( long id ) { - try (Transaction tx = database.getGraph().beginTransaction( implicit, AnonymousContext.write() )) + try ( Transaction tx = database.getGraph().beginTransaction( implicit, AnonymousContext.write() ) ) { Node node = database.getGraph().getNodeById( id ); node.delete(); @@ -150,12 +150,11 @@ public void deleteNode( long id ) public long createRelationship( String type, long startNodeId, long endNodeId ) { - try (Transaction tx = database.getGraph().beginTransaction( implicit, AnonymousContext.writeToken() )) + try ( Transaction tx = database.getGraph().beginTransaction( implicit, AnonymousContext.writeToken() ) ) { Node startNode = database.getGraph().getNodeById( startNodeId ); Node endNode = database.getGraph().getNodeById( endNodeId ); - Relationship relationship = startNode.createRelationshipTo( endNode, - RelationshipType.withName( type ) ); + Relationship relationship = startNode.createRelationshipTo( endNode, RelationshipType.withName( type ) ); tx.success(); return relationship.getId(); } @@ -201,7 +200,7 @@ public Map getRelationshipProperties( long relationshipId ) public Relationship getRelationship( long relationshipId ) { - try (Transaction tx = database.getGraph().beginTransaction( implicit, AnonymousContext.read() )) + try ( Transaction tx = database.getGraph().beginTransaction( implicit, AnonymousContext.read() ) ) { Relationship relationship = database.getGraph().getRelationshipById( relationshipId ); tx.success(); @@ -211,7 +210,7 @@ public Relationship getRelationship( long relationshipId ) public void addNodeToIndex( String indexName, String key, Object value, long id ) { - try (Transaction tx = database.getGraph().beginTransaction( implicit, AUTH_DISABLED )) + try ( Transaction tx = database.getGraph().beginTransaction( implicit, AUTH_DISABLED ) ) { database.getGraph().index().forNodes( indexName ).add( database.getGraph().getNodeById( id ), key, value ); tx.success(); @@ -273,7 +272,7 @@ public void addRelationshipToIndex( String indexName, String key, String value, public String[] getNodeIndexes() { - try (Transaction transaction = database.getGraph().beginTransaction( implicit, AnonymousContext.read() )) + try ( Transaction transaction = database.getGraph().beginTransaction( implicit, AnonymousContext.read() ) ) { return database.getGraph().index().nodeIndexNames(); } @@ -302,16 +301,15 @@ public Index createNodeIndex( String named ) public String[] getRelationshipIndexes() { - try (Transaction transaction = database.getGraph().beginTransaction( implicit, AnonymousContext.read() )) + try ( Transaction transaction = database.getGraph().beginTransaction( implicit, AnonymousContext.read() ) ) { - return database.getGraph().index() - .relationshipIndexNames(); + return database.getGraph().index().relationshipIndexNames(); } } public long getFirstNode() { - try (Transaction tx = database.getGraph().beginTransaction( implicit, AnonymousContext.write() )) + try ( Transaction tx = database.getGraph().beginTransaction( implicit, AnonymousContext.write() ) ) { try { @@ -331,7 +329,7 @@ public long getFirstNode() public Index createRelationshipIndex( String named ) { - try (Transaction transaction = database.getGraph().beginTransaction( implicit, AUTH_DISABLED )) + try ( Transaction transaction = database.getGraph().beginTransaction( implicit, AUTH_DISABLED ) ) { RelationshipIndex relationshipIndex = database.getGraph().index() .forRelationships( named ); @@ -415,7 +413,7 @@ public ConstraintDefinition createPropertyUniquenessConstraint( String labelName public long getLabelCount( long nodeId ) { - try (Transaction transaction = database.getGraph().beginTransaction( implicit, AnonymousContext.read() )) + try ( Transaction transaction = database.getGraph().beginTransaction( implicit, AnonymousContext.read() ) ) { return count( database.getGraph().getNodeById( nodeId ).getLabels()); } diff --git a/community/server/src/test/java/org/neo4j/server/rest/domain/PropertySettingStrategyTest.java b/community/server/src/test/java/org/neo4j/server/rest/domain/PropertySettingStrategyTest.java index 46acb8ad4e9a8..fb1f4364ea069 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/domain/PropertySettingStrategyTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/domain/PropertySettingStrategyTest.java @@ -19,17 +19,17 @@ */ package org.neo4j.server.rest.domain; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.kernel.internal.GraphDatabaseAPI; @@ -160,7 +160,7 @@ public void shouldNotFailSettingEmptyArrayAndOtherValuesIfEntityAlreadyHasAnEmpt assertThat( (String[]) node.getProperty( "arr" ), is(new String[]{})); } - @Test(expected = PropertyValueException.class) + @Test( expected = PropertyValueException.class ) public void shouldThrowPropertyErrorWhenSettingEmptyArrayOnEntityWithNoPreExistingProperty() throws Exception { // Given @@ -170,7 +170,7 @@ public void shouldThrowPropertyErrorWhenSettingEmptyArrayOnEntityWithNoPreExisti propSetter.setProperty( node, "arr", new ArrayList() ); } - @Test(expected = PropertyValueException.class) + @Test( expected = PropertyValueException.class ) public void shouldThrowPropertyErrorWhenSettingEmptyArrayOnEntityWithNoPreExistingEmptyArray() throws Exception { // Given diff --git a/community/server/src/test/java/org/neo4j/server/rest/domain/TraversalDescriptionBuilderTest.java b/community/server/src/test/java/org/neo4j/server/rest/domain/TraversalDescriptionBuilderTest.java index bcbdc09b91315..a521bd8630dbc 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/domain/TraversalDescriptionBuilderTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/domain/TraversalDescriptionBuilderTest.java @@ -19,17 +19,17 @@ */ package org.neo4j.server.rest.domain; -import static org.neo4j.helpers.collection.MapUtil.map; +import org.junit.Test; import java.util.ArrayList; import java.util.Collection; import java.util.Map; -import org.junit.Test; +import static org.neo4j.helpers.collection.MapUtil.map; public class TraversalDescriptionBuilderTest { - @Test(expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void throwsIllegalArgumentOnUnknownExpanderType() throws Exception { // Given @@ -43,7 +43,7 @@ public void throwsIllegalArgumentOnUnknownExpanderType() throws Exception "expander", "Suddenly, a string!" ) ); } - @Test(expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void throwsIllegalArgumentOnNonStringExpanderType() throws Exception { // Given diff --git a/community/server/src/test/java/org/neo4j/server/rest/repr/CypherResultRepresentationTest.java b/community/server/src/test/java/org/neo4j/server/rest/repr/CypherResultRepresentationTest.java index a7842719cb6a5..791fd5d693fcf 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/repr/CypherResultRepresentationTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/repr/CypherResultRepresentationTest.java @@ -51,7 +51,7 @@ public class CypherResultRepresentationTest public DatabaseRule database = new ImpermanentDatabaseRule(); @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldSerializeProfilingResult() throws Exception { // Given @@ -91,7 +91,7 @@ public void shouldSerializeProfilingResult() throws Exception } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldNotIncludePlanUnlessAskedFor() throws Exception { // Given diff --git a/community/server/src/test/java/org/neo4j/server/rest/repr/ExceptionRepresentationTest.java b/community/server/src/test/java/org/neo4j/server/rest/repr/ExceptionRepresentationTest.java index 761dd485648fd..4264214f9f119 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/repr/ExceptionRepresentationTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/repr/ExceptionRepresentationTest.java @@ -45,7 +45,7 @@ public void shouldIncludeCause() throws Exception { // Given ExceptionRepresentation rep = new ExceptionRepresentation( - new RuntimeException("Hoho", new RuntimeException("Haha", new RuntimeException( "HAHA!" )) )); + new RuntimeException( "Hoho", new RuntimeException( "Haha", new RuntimeException( "HAHA!" ) ) ) ); // When JsonNode out = serialize( rep ); @@ -91,7 +91,7 @@ public void shoudExcludeLegacyFormatIfAsked() throws Exception private JsonNode serialize( ExceptionRepresentation rep ) throws JsonParseException { Map output = new HashMap<>(); - MappingSerializer serializer = new MappingSerializer( new MapWrappingWriter(output), URI.create( "" ), + MappingSerializer serializer = new MappingSerializer( new MapWrappingWriter( output ), URI.create( "" ), mock(ExtensionInjector.class ) ); // When diff --git a/community/server/src/test/java/org/neo4j/server/rest/repr/MapRepresentationTest.java b/community/server/src/test/java/org/neo4j/server/rest/repr/MapRepresentationTest.java index d87e3761664de..d33f42c3e5667 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/repr/MapRepresentationTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/repr/MapRepresentationTest.java @@ -58,7 +58,7 @@ public void shouldSerializeMapWithSimpleTypes() throws Exception } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldSerializeMapWithArrayTypes() throws Exception { MapRepresentation rep = new MapRepresentation( map( @@ -79,7 +79,7 @@ public void shouldSerializeMapWithArrayTypes() throws Exception } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldSerializeMapWithListsOfSimpleTypes() throws Exception { MapRepresentation rep = new MapRepresentation( map( "lists of nulls", asList( null, null ), @@ -115,7 +115,7 @@ public void shouldSerializeMapWithMapsOfSimpleTypes() throws Exception } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldSerializeArbitrarilyNestedMapsAndLists() throws Exception { MapRepresentation rep = new MapRepresentation( diff --git a/community/server/src/test/java/org/neo4j/server/rest/repr/OutputFormatTest.java b/community/server/src/test/java/org/neo4j/server/rest/repr/OutputFormatTest.java index 6ac96f8803995..5dc06983e74b7 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/repr/OutputFormatTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/repr/OutputFormatTest.java @@ -19,16 +19,15 @@ */ package org.neo4j.server.rest.repr; -import static org.junit.Assert.assertEquals; +import org.junit.Test; import java.net.URI; - import javax.ws.rs.core.Response; -import org.junit.Test; - import org.neo4j.server.rest.repr.formats.JsonFormat; +import static org.junit.Assert.assertEquals; + public class OutputFormatTest { @Test @@ -41,6 +40,6 @@ public void shouldReturnAbsoluteURIForSeeOther() throws Exception Response response = outputFormat.seeOther( relativeURI ); assertEquals( 303, response.getStatus() ); - assertEquals( new URI("http://base.local:8765/test/path"), response.getMetadata().getFirst( "Location" ) ); + assertEquals( new URI( "http://base.local:8765/test/path" ), response.getMetadata().getFirst( "Location" ) ); } } diff --git a/community/server/src/test/java/org/neo4j/server/rest/repr/PathRepresentationTest.java b/community/server/src/test/java/org/neo4j/server/rest/repr/PathRepresentationTest.java index 32098e2045b63..74582afab6ecf 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/repr/PathRepresentationTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/repr/PathRepresentationTest.java @@ -125,8 +125,7 @@ private PathRepresentation pathrep() Relationship cb = relationship( 18, c, "HATES", b ); Relationship cd = relationship( 19, c, "KNOWS", d ); - return new PathRepresentation( - path( a, link( ab, b ), link( cb, c ), link( cd, d ) )); + return new PathRepresentation( path( a, link( ab, b ), link( cb, c ), link( cd, d ) ) ); } public static void verifySerialisation( Map pathrep ) diff --git a/community/server/src/test/java/org/neo4j/server/rest/security/CommunityServerTestBase.java b/community/server/src/test/java/org/neo4j/server/rest/security/CommunityServerTestBase.java index aa3ebe5b7dbf1..7dfb6c9510dfb 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/security/CommunityServerTestBase.java +++ b/community/server/src/test/java/org/neo4j/server/rest/security/CommunityServerTestBase.java @@ -71,7 +71,7 @@ protected String passwordURL( String username ) return server.baseUri().resolve( "user/" + username + "/password" ).toString(); } - protected String base64(String value) + protected String base64( String value ) { return UTF8.decode( Base64.encode( value ) ); } diff --git a/community/server/src/test/java/org/neo4j/server/rest/security/PermanentlyForbiddenSecurityRule.java b/community/server/src/test/java/org/neo4j/server/rest/security/PermanentlyForbiddenSecurityRule.java index 8758aa2cf6b05..86b50ea84091d 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/security/PermanentlyForbiddenSecurityRule.java +++ b/community/server/src/test/java/org/neo4j/server/rest/security/PermanentlyForbiddenSecurityRule.java @@ -32,7 +32,7 @@ public boolean isAuthorized( HttpServletRequest request ) } @Override - public boolean isForbidden(HttpServletRequest request) + public boolean isForbidden( HttpServletRequest request ) { return true; } diff --git a/community/server/src/test/java/org/neo4j/server/rest/security/UriPathWildcardMatcherTest.java b/community/server/src/test/java/org/neo4j/server/rest/security/UriPathWildcardMatcherTest.java index 02d19356f1014..4b53c21b7219d 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/security/UriPathWildcardMatcherTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/security/UriPathWildcardMatcherTest.java @@ -19,71 +19,72 @@ */ package org.neo4j.server.rest.security; +import org.junit.Test; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.junit.Test; - public class UriPathWildcardMatcherTest { @Test public void shouldFailWithoutAsteriskAtStart() { - UriPathWildcardMatcher matcher = new UriPathWildcardMatcher("/some/uri/path"); + UriPathWildcardMatcher matcher = new UriPathWildcardMatcher( "/some/uri/path" ); - assertFalse(matcher.matches("preamble/some/uri/path")); + assertFalse(matcher.matches( "preamble/some/uri/path" )); } @Test public void shouldFailWithoutAsteriskAtEnd() { - UriPathWildcardMatcher matcher = new UriPathWildcardMatcher("/some/uri/path/and/some/more"); + UriPathWildcardMatcher matcher = new UriPathWildcardMatcher( "/some/uri/path/and/some/more" ); - assertFalse(matcher.matches("/some/uri/path/with/middle/bit/and/some/more")); + assertFalse(matcher.matches( "/some/uri/path/with/middle/bit/and/some/more" )); } @Test public void shouldMatchAsteriskAtStart() { - UriPathWildcardMatcher matcher = new UriPathWildcardMatcher("*/some/uri/path"); + UriPathWildcardMatcher matcher = new UriPathWildcardMatcher( "*/some/uri/path" ); - assertTrue(matcher.matches("anything/i/like/followed/by/some/uri/path")); - assertFalse(matcher.matches("anything/i/like/followed/by/some/deliberately/changed/to/fail/uri/path")); + assertTrue(matcher.matches( "anything/i/like/followed/by/some/uri/path" )); + assertFalse(matcher.matches( "anything/i/like/followed/by/some/deliberately/changed/to/fail/uri/path" )); } @Test public void shouldMatchAsteriskAtEnd() { - UriPathWildcardMatcher matcher = new UriPathWildcardMatcher("/some/uri/path/*"); + UriPathWildcardMatcher matcher = new UriPathWildcardMatcher( "/some/uri/path/*" ); - assertTrue(matcher.matches("/some/uri/path/followed/by/anything/i/like")); + assertTrue(matcher.matches( "/some/uri/path/followed/by/anything/i/like" )); } @Test public void shouldMatchAsteriskInMiddle() { - UriPathWildcardMatcher matcher = new UriPathWildcardMatcher("/some/uri/path/*/and/some/more"); + UriPathWildcardMatcher matcher = new UriPathWildcardMatcher( "/some/uri/path/*/and/some/more" ); - assertTrue(matcher.matches("/some/uri/path/with/middle/bit/and/some/more")); + assertTrue(matcher.matches( "/some/uri/path/with/middle/bit/and/some/more" )); } @Test public void shouldMatchMultipleAsterisksInMiddle() { - UriPathWildcardMatcher matcher = new UriPathWildcardMatcher("/some/uri/path/*/and/some/more/*/and/a/final/bit"); + UriPathWildcardMatcher matcher = new UriPathWildcardMatcher( "/some/uri/path/*/and/some/more/*/and/a/final/bit" ); assertTrue(matcher.matches( - "/some/uri/path/with/middle/bit/and/some/more/with/additional/asterisk/part/and/a/final/bit")); + "/some/uri/path/with/middle/bit/and/some/more/with/additional/asterisk/part/and/a/final/bit" )); } @Test public void shouldMatchMultipleAsterisksAtStartAndInMiddle() { UriPathWildcardMatcher matcher = new UriPathWildcardMatcher( - "*/some/uri/path/*/and/some/more/*/and/a/final/bit"); + "*/some/uri/path/*/and/some/more/*/and/a/final/bit" ); assertTrue(matcher.matches( - "a/bit/of/preamble/and/then/some/uri/path/with/middle/bit/and/some/more/with/additional/asterisk/part/and/a/final/bit")); + "a/bit/of/preamble/and/then/some/uri/path/with/middle/bit/and/some/more/with/additional/asterisk" + + "/part/and/a/final/bit" )); } @@ -91,10 +92,11 @@ public void shouldMatchMultipleAsterisksAtStartAndInMiddle() public void shouldMatchMultipleAsterisksAtEndAndInMiddle() { UriPathWildcardMatcher matcher = new UriPathWildcardMatcher( - "/some/uri/path/*/and/some/more/*/and/a/final/bit/*"); + "/some/uri/path/*/and/some/more/*/and/a/final/bit/*" ); assertTrue(matcher.matches( - "/some/uri/path/with/middle/bit/and/some/more/with/additional/asterisk/part/and/a/final/bit/and/now/some/post/amble")); + "/some/uri/path/with/middle/bit/and/some/more/with/additional/asterisk/part/and/a/final/bit/and/now" + + "/some/post/amble" )); } @@ -102,33 +104,34 @@ public void shouldMatchMultipleAsterisksAtEndAndInMiddle() public void shouldMatchMultipleAsterisksAtStartAndEndAndInMiddle() { UriPathWildcardMatcher matcher = new UriPathWildcardMatcher( - "*/some/uri/path/*/and/some/more/*/and/a/final/bit/*"); + "*/some/uri/path/*/and/some/more/*/and/a/final/bit/*" ); assertTrue(matcher.matches( - "a/bit/of/preamble/and/then//some/uri/path/with/middle/bit/and/some/more/with/additional/asterisk/part/and/a/final/bit/and/now/some/post/amble")); + "a/bit/of/preamble/and/then//some/uri/path/with/middle/bit/and/some/more/with/additional/asterisk" + + "/part/and/a/final/bit/and/now/some/post/amble" )); } @Test public void shouldMatchMultipleSimpleString() { - UriPathWildcardMatcher matcher = new UriPathWildcardMatcher("str"); + UriPathWildcardMatcher matcher = new UriPathWildcardMatcher( "str" ); - assertTrue(matcher.matches("str")); + assertTrue(matcher.matches( "str" )); } @Test public void shouldMatchMultipleSimpleStringWithALeadingWildcard() { - UriPathWildcardMatcher matcher = new UriPathWildcardMatcher("*str"); + UriPathWildcardMatcher matcher = new UriPathWildcardMatcher( "*str" ); - assertTrue(matcher.matches("my_str")); + assertTrue(matcher.matches( "my_str" )); } @Test public void shouldFailToMatchMultipleSimpleStringWithATrailingWildcard() { - UriPathWildcardMatcher matcher = new UriPathWildcardMatcher("str*"); + UriPathWildcardMatcher matcher = new UriPathWildcardMatcher( "str*" ); - assertFalse(matcher.matches("my_str")); + assertFalse(matcher.matches( "my_str" )); } } diff --git a/community/server/src/test/java/org/neo4j/server/rest/security/UsersIT.java b/community/server/src/test/java/org/neo4j/server/rest/security/UsersIT.java index 0fee732f565e0..ec4235b55c051 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/security/UsersIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/security/UsersIT.java @@ -142,7 +142,7 @@ public void cleanup() } } - public void startServer(boolean authEnabled) throws IOException + public void startServer( boolean authEnabled ) throws IOException { server = CommunityServerBuilder.server() .withProperty( GraphDatabaseSettings.auth_enabled.name(), Boolean.toString( authEnabled ) ) @@ -181,7 +181,7 @@ private String passwordURL( String username ) return server.baseUri().resolve( "user/" + username + "/password" ).toString(); } - private String base64(String value) + private String base64( String value ) { return UTF8.decode( Base64.encode( value ) ); } diff --git a/community/server/src/test/java/org/neo4j/server/rest/streaming/StreamingBatchOperationIT.java b/community/server/src/test/java/org/neo4j/server/rest/streaming/StreamingBatchOperationIT.java index bf76a493e42a5..0ada8886d04d2 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/streaming/StreamingBatchOperationIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/streaming/StreamingBatchOperationIT.java @@ -59,7 +59,7 @@ public class StreamingBatchOperationIT extends AbstractRestFunctionalTestBase */ @SuppressWarnings( "unchecked" ) @Test - @Graph("Joe knows John") + @Graph( "Joe knows John" ) public void execute_multiple_operations_in_batch_streaming() throws Exception { long idJoe = data.get().get( "Joe" ).getId(); @@ -330,7 +330,7 @@ public void shouldRollbackAllWhenGivenIncorrectRequest() throws JsonParseExcepti } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldHandleUnicodeGetCorrectly() throws Exception { String asianText = "\u4f8b\u5b50"; @@ -367,7 +367,7 @@ public void shouldHandleUnicodeGetCorrectly() throws Exception } @Test - @Graph("Peter likes Jazz") + @Graph( "Peter likes Jazz" ) public void shouldHandleEscapedStrings() throws ClientHandlerException, UniformInterfaceException, JSONException, JsonParseException { diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/CypherQueriesIT.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/CypherQueriesIT.java index ba1aac0a7cf3f..87fdb3d63ae25 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/CypherQueriesIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/CypherQueriesIT.java @@ -19,17 +19,16 @@ */ package org.neo4j.server.rest.transactional; +import org.junit.Test; + import java.util.Iterator; import java.util.List; import java.util.Map; -import org.junit.Test; - import org.neo4j.server.rest.AbstractRestFunctionalTestBase; import org.neo4j.server.rest.domain.JsonParseException; import static org.junit.Assert.assertFalse; - import static org.neo4j.server.rest.RESTRequestGenerator.ResponseEntity; import static org.neo4j.server.rest.domain.JsonHelper.jsonToMap; @@ -52,7 +51,7 @@ public void runningWithGeometryTypes() throws JsonParseException private void assertNoErrors( Map response ) { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Iterator> errors = ((List>) response.get( "errors" )).iterator(); assertFalse( errors.hasNext() ); } diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/ExecutionResultSerializerTest.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/ExecutionResultSerializerTest.java index 504bfd43372c3..d34a32734238a 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/ExecutionResultSerializerTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/ExecutionResultSerializerTest.java @@ -77,7 +77,10 @@ import static org.neo4j.helpers.collection.MapUtil.map; import static org.neo4j.server.rest.domain.JsonHelper.jsonNode; import static org.neo4j.server.rest.domain.JsonHelper.readJson; -import static org.neo4j.server.rest.transactional.Neo4jJsonCodecTest.*; +import static org.neo4j.server.rest.transactional.Neo4jJsonCodecTest.MockGeometry; +import static org.neo4j.server.rest.transactional.Neo4jJsonCodecTest.MockPoint; +import static org.neo4j.server.rest.transactional.Neo4jJsonCodecTest.mockCartesian; +import static org.neo4j.server.rest.transactional.Neo4jJsonCodecTest.mockWGS84; import static org.neo4j.test.Property.property; import static org.neo4j.test.mockito.mock.GraphMock.link; import static org.neo4j.test.mockito.mock.GraphMock.node; @@ -399,8 +402,8 @@ public void shouldSerializePointsAsListOfMapsOfProperties() throws Exception ExecutionResultSerializer serializer = getSerializerWith( output ); List points = new ArrayList<>(); - points.add( new Coordinate(1,2) ); - points.add( new Coordinate(2,3) ); + points.add( new Coordinate( 1, 2 ) ); + points.add( new Coordinate( 2, 3 ) ); Result executionResult = mockExecutionResult( map( "geom", new MockPoint( 12.3, 45.6, mockWGS84() ) ), map( "geom", new MockPoint( 123, 456, mockCartesian() ) ), @@ -785,7 +788,7 @@ private JsonNode assertIsPlanRoot( String result ) throws UnsupportedEncodingExc return root; } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private Map planRootMap( String resultString ) throws JsonParseException { Map resultMap = (Map) ((List) ((Map) (readJson( resultString ))).get("results")).get( 0 ); @@ -816,7 +819,7 @@ public void shouldLogIOErrors() throws Exception public void shouldAbbreviateWellKnownIOErrors() throws Exception { // given - OutputStream output = mock( OutputStream.class, new ThrowsException( new IOException("Broken pipe") ) ); + OutputStream output = mock( OutputStream.class, new ThrowsException( new IOException( "Broken pipe" ) ) ); AssertableLogProvider logProvider = new AssertableLogProvider(); ExecutionResultSerializer serializer = getSerializerWith( output, null, logProvider ); @@ -932,7 +935,7 @@ private static Result mockExecutionResult( Map... rows ) } @SafeVarargs - private static Result mockExecutionResult(ExecutionPlanDescription planDescription, Map... rows ) + private static Result mockExecutionResult( ExecutionPlanDescription planDescription, Map... rows ) { return mockExecutionResult( planDescription, Collections.emptyList(), rows ); } diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/Neo4jJsonCodecTest.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/Neo4jJsonCodecTest.java index 570026e27c1fd..3924dfc716511 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/Neo4jJsonCodecTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/Neo4jJsonCodecTest.java @@ -30,14 +30,14 @@ import java.util.List; import java.util.Map; -import org.neo4j.graphdb.spatial.Coordinate; -import org.neo4j.graphdb.spatial.Geometry; -import org.neo4j.graphdb.spatial.Point; -import org.neo4j.graphdb.spatial.CRS; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.Relationship; +import org.neo4j.graphdb.spatial.CRS; +import org.neo4j.graphdb.spatial.Coordinate; +import org.neo4j.graphdb.spatial.Geometry; +import org.neo4j.graphdb.spatial.Point; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.anyInt; @@ -256,8 +256,8 @@ public void testGeometryWriting() throws IOException { //Given List points = new ArrayList<>(); - points.add( new Coordinate(1,2) ); - points.add( new Coordinate(2,3) ); + points.add( new Coordinate( 1, 2 ) ); + points.add( new Coordinate( 2, 3 ) ); Geometry value = new MockGeometry( "LineString", points, mockCartesian() ); //When @@ -304,7 +304,7 @@ public static class MockPoint extends MockGeometry implements Point public MockPoint( final double x, final double y, final CRS crs ) { - super("Point", new ArrayList<>(), crs); + super( "Point", new ArrayList<>(), crs ); this.coordinate = new Coordinate( x, y ); this.coordinates.add( this.coordinate ); } diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/RowWriterTest.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/RowWriterTest.java index ffd7216c8025a..8335a49de2672 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/RowWriterTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/RowWriterTest.java @@ -19,14 +19,15 @@ */ package org.neo4j.server.rest.transactional; -import java.io.ByteArrayOutputStream; -import java.io.IOException; - import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.JsonNode; import org.hamcrest.MatcherAssert; import org.junit.Test; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; + import org.neo4j.server.rest.domain.JsonParseException; import static java.util.Arrays.asList; @@ -41,7 +42,7 @@ public class RowWriterTest public void shouldWriteNestedMaps() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); - JsonGenerator json = new JsonFactory(new Neo4jJsonCodec()).createJsonGenerator( out ); + JsonGenerator json = new JsonFactory( new Neo4jJsonCodec() ).createJsonGenerator( out ); JsonNode row = serialize( out, json, new RowWriter( ) ); diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/StatementDeserializerTest.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/StatementDeserializerTest.java index 905a785a42a6e..c171972860595 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/StatementDeserializerTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/StatementDeserializerTest.java @@ -40,7 +40,7 @@ public class StatementDeserializerTest { @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldDeserializeSingleStatement() throws Exception { // Given @@ -67,9 +67,8 @@ public void shouldRejectMapWithADifferentFieldBeforeStatement() throws Exception String json = "{ \"timeout\" : 200, \"statements\" : [ { \"statement\" : \"ignored\", \"parameters\" : {}} ] }"; - assertYieldsErrors( json, - new Neo4jError( Status.Request.InvalidFormat, - new DeserializationException( "Unable to deserialize request. Expected first field to be 'statements', but was 'timeout'." ))); + assertYieldsErrors( json, new Neo4jError( Status.Request.InvalidFormat, new DeserializationException( + "Unable to deserialize request. Expected first field to be 'statements', but was 'timeout'." ) ) ); } @Test @@ -144,7 +143,7 @@ public void shouldTreatEmptyInputStreamAsEmptyStatementList() throws Exception } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldDeserializeMultipleStatements() throws Exception { // Given diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionHandleRegistryTest.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionHandleRegistryTest.java index 1e555837c4292..60d95fffa1634 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionHandleRegistryTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionHandleRegistryTest.java @@ -245,7 +245,7 @@ public void shouldProvideInterruptHandlerForSuspendedTransaction() throws Transa verifyNoMoreInteractions( handle ); } - @Test(expected = InvalidTransactionId.class) + @Test( expected = InvalidTransactionId.class ) public void gettingInterruptHandlerForUnknownIdShouldThrowErrorInvalidTransactionId() throws TransactionLifecycleException { // Given diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionHandleTest.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionHandleTest.java index 2d5162d8b7a82..4dcb25a679a8c 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionHandleTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionHandleTest.java @@ -238,7 +238,7 @@ public void shouldCommitTransactionAndTellRegistryToForgetItsHandle() throws Exc ExecutionResultSerializer output = mock( ExecutionResultSerializer.class ); // when - Statement statement = new Statement("query", map(), false, (ResultDataContent[]) null); + Statement statement = new Statement( "query", map(), false, (ResultDataContent[]) null ); handle.commit( statements( statement ), output, mock( HttpServletRequest.class ) ); // then @@ -412,7 +412,7 @@ public void shouldLogMessageIfCypherSyntaxErrorOccurs() throws Exception ExecutionResultSerializer output = mock( ExecutionResultSerializer.class ); // when - Statement statement = new Statement("matsch (n) return n", map(), false, (ResultDataContent[]) null); + Statement statement = new Statement( "matsch (n) return n", map(), false, (ResultDataContent[]) null ); handle.commit( statements( statement ), output, mock( HttpServletRequest.class ) ); // then diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionTest.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionTest.java index 48ed95b964510..9e5c404fe497f 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionTest.java @@ -313,11 +313,11 @@ public void handling_errors() throws JsonParseException } @Test - @Documented("Handling errors in an open transaction\n" + + @Documented( "Handling errors in an open transaction\n" + "\n" + "Whenever there is an error in a request the server will rollback the transaction.\n" + "By inspecting the response for the presence/absence of the `transaction` key you can tell if the " + - "transaction is still open") + "transaction is still open" ) public void errors_in_open_transaction() throws JsonParseException { // Given @@ -364,7 +364,7 @@ private void assertNoErrors( Map response ) private void assertErrors( Map response, Status... expectedErrors ) { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Iterator> errors = ((List>) response.get( "errors" )).iterator(); Iterator expected = iterator( expectedErrors ); @@ -385,7 +385,7 @@ private T resultCell( HTTP.Response response, int row, int column ) return resultCell( response.>content(), row, column ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private T resultCell( Map response, int row, int column ) { Map result = ((List>) response.get( "results" )).get( 0 ); @@ -393,7 +393,7 @@ private T resultCell( Map response, int row, int column ) return (T) data.get( row ).get( "row" ).get( column ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private Map> graphRow( Map response, int row ) { Map result = ((List>) response.get( "results" )).get( 0 ); diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionErrorIT.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionErrorIT.java index 4efc0888d8eb1..e19c41752e26a 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionErrorIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionErrorIT.java @@ -84,7 +84,7 @@ public void begin__commit_with_malformed_json() throws Exception assertThat( countNodes(), equalTo( nodesInDatabaseBeforeTransaction ) ); } - @SuppressWarnings("ResultOfMethodCallIgnored") + @SuppressWarnings( "ResultOfMethodCallIgnored" ) @Test public void begin_and_execute_periodic_commit_that_fails() throws Exception { diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionMatchers.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionMatchers.java index 3f448d6c47cd5..41f7be434146f 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionMatchers.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionMatchers.java @@ -557,8 +557,8 @@ public void describeTo( Description description ) }; } - @SuppressWarnings("WhileLoopReplaceableByForEach") - public static long countNodes(GraphDatabaseService graphdb) + @SuppressWarnings( "WhileLoopReplaceableByForEach" ) + public static long countNodes( GraphDatabaseService graphdb ) { try ( Transaction ignore = graphdb.beginTx() ) { @@ -581,7 +581,7 @@ public static Matcher containsNoStackTraces() protected boolean matchesSafely( HTTP.Response response ) { Map content = response.content(); - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) List> errors = (List>) content.get( "errors" ); for ( Map error : errors ) diff --git a/community/server/src/test/java/org/neo4j/server/rest/web/CollectUserAgentFilterIT.java b/community/server/src/test/java/org/neo4j/server/rest/web/CollectUserAgentFilterIT.java index 80350ff536342..3c8261964147b 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/web/CollectUserAgentFilterIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/web/CollectUserAgentFilterIT.java @@ -56,7 +56,7 @@ public void shouldRecordUserAgent() throws Exception assertThat( resolveDependency( UsageData.class ).get( UsageDataKeys.clientNames ), hasItem( USER_AGENT ) ); } - private void sendRequest(String userAgent) + private void sendRequest( String userAgent ) { String url = functionalTestHelper.baseUri().toString(); JaxRsResponse resp = RestRequest.req().header( "User-Agent", userAgent ).get(url); diff --git a/community/server/src/test/java/org/neo4j/server/rest/web/CollectUserAgentFilterTest.java b/community/server/src/test/java/org/neo4j/server/rest/web/CollectUserAgentFilterTest.java index 1422c1bf05d3d..8c28f1aa519ec 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/web/CollectUserAgentFilterTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/web/CollectUserAgentFilterTest.java @@ -44,7 +44,7 @@ public class CollectUserAgentFilterTest { - private final RecentK agents = new RecentK<>(10); + private final RecentK agents = new RecentK<>( 10 ); private final FilterChain filterChain = mock( FilterChain.class ); private final CollectUserAgentFilter filter = new CollectUserAgentFilter( agents ); diff --git a/community/server/src/test/java/org/neo4j/server/rest/web/DatabaseActionsTest.java b/community/server/src/test/java/org/neo4j/server/rest/web/DatabaseActionsTest.java index 81dfa06fab26e..5e8f907363ccd 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/web/DatabaseActionsTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/web/DatabaseActionsTest.java @@ -140,7 +140,7 @@ public void createdNodeShouldBeInDatabase() throws Exception { NodeRepresentation noderep = actions.createNode( Collections.emptyMap() ); - try (Transaction tx = database.getGraph().beginTx()) + try ( Transaction tx = database.getGraph().beginTx() ) { assertNotNull( database.getGraph().getNodeById( noderep.getId() ) ); } @@ -170,7 +170,7 @@ public void shouldBeAbleToStorePropertiesInAnExistingNode() throws } } - @Test(expected = PropertyValueException.class) + @Test( expected = PropertyValueException.class ) public void shouldFailOnTryingToStoreMixedArraysAsAProperty() throws Exception { long nodeId = graphdbHelper.createNode(); @@ -202,7 +202,7 @@ public void shouldOverwriteExistingProperties() throws PropertyValueException, properties.put( "foo", "bar" ); properties.put( "baz", 17 ); actions.setAllNodeProperties( nodeId, properties ); - try (Transaction tx = database.getGraph().beginTx()) + try ( Transaction tx = database.getGraph().beginTx() ) { Node node = database.getGraph().getNodeById( nodeId ); assertHasProperties( node, properties ); @@ -407,7 +407,7 @@ public void shouldReturnTrueIfNodePropertyRemoved() throws Exception actions.removeNodeProperty( nodeId, "foo" ); } - @Test(expected = NoSuchPropertyException.class) + @Test( expected = NoSuchPropertyException.class ) public void shouldReturnFalseIfNodePropertyNotRemoved() throws Exception { Map properties = new HashMap<>(); @@ -603,7 +603,7 @@ public void shouldRemoveRelationshipProperty() throws Exception .size() ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private void verifyRelReps( int expectedSize, ListRepresentation repr ) { List relreps = serialize( repr ); @@ -686,7 +686,7 @@ public void shouldGetExtendedNodeRepresentationsWhenGettingFromIndex() for ( Object indexedNode : indexedNodes ) { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Map serialized = (Map) indexedNode; NodeRepresentationTest.verifySerialisation( serialized ); assertNotNull( serialized.get( "indexed" ) ); @@ -950,7 +950,7 @@ public void shouldBeAbleToGetRelationshipsIfSpecified() for ( Object hit : hits ) { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Map map = (Map) hit; RelationshipRepresentationTest.verifySerialisation( map ); } @@ -970,7 +970,7 @@ public void shouldBeAbleToGetPathsIfSpecified() for ( Object hit : hits ) { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Map map = (Map) hit; assertThat( map, hasKey( "start" ) ); assertThat( map, hasKey( "end" ) ); @@ -992,21 +992,21 @@ public void shouldBeAbleToGetFullPathsIfSpecified() for ( Object hit : hits ) { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Map map = (Map) hit; - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Collection relationships = (Collection) map.get( "relationships" ); for ( Object rel : relationships ) { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Map relationship = (Map) rel; RelationshipRepresentationTest.verifySerialisation( relationship ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Collection nodes = (Collection) map.get( "nodes" ); for ( Object n : nodes ) { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Map node = (Map) n; NodeRepresentationTest.verifySerialisation( node ); } @@ -1099,7 +1099,7 @@ public void shouldBeAbleToGetPathsUsingDijkstraWithDefaults() throws Exception } } - @Test(expected = NotFoundException.class) + @Test( expected = NotFoundException.class ) public void shouldHandleNoFoundPathsCorrectly() { long[] nodes = createMoreComplexGraph(); @@ -1191,7 +1191,7 @@ public void getNodesWithLabel() throws Exception }, representation ) ) ); } - @Test(expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void getNodesWithLabelAndSeveralPropertiesShouldFail() throws Exception { // WHEN @@ -1203,7 +1203,7 @@ private void assertPaths( int numPaths, long[] nodes, int length, List r assertEquals( numPaths, result.size() ); for ( Object path : result ) { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Map serialized = (Map) path; assertTrue( serialized.get( "start" ) .toString() diff --git a/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java b/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java index c0aa5098845cf..b0db0cefeaa34 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java @@ -40,7 +40,6 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.graphdb.index.IndexHits; import org.neo4j.helpers.collection.MapUtil; import org.neo4j.kernel.api.exceptions.Status.Request; @@ -48,7 +47,6 @@ import org.neo4j.kernel.api.exceptions.Status.Statement; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; -import org.neo4j.server.configuration.ServerSettings; import org.neo4j.server.database.Database; import org.neo4j.server.database.WrappedDatabase; import org.neo4j.server.plugins.ConfigAdapter; @@ -68,7 +66,6 @@ import org.neo4j.time.Clocks; import static java.lang.Long.parseLong; -import static java.util.Collections.emptyMap; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.hasItem; @@ -164,7 +161,7 @@ private static String entityAsString( Response response ) return UTF8.decode( bytes ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private static List entityAsList( Response response ) throws JsonParseException { @@ -241,14 +238,14 @@ public void shouldRespondWith201LocationHeaderAndNodeRepresentationInJSONWhenPop assertTrue( map.containsKey( "self" ) ); - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Map data = (Map) map.get( "data" ); assertEquals( "bar", data.get( "foo" ) ); } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public void shouldRespondWith201LocationHeaderAndNodeRepresentationInJSONWhenPopulatedNodeCreatedWithArrays() throws Exception { @@ -528,7 +525,7 @@ public void shouldReturnRelationshipRepresentationWhenCreatingRelationship() thr checkContentTypeCharsetUtf8( response ); - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Map data = (Map) map.get( "data" ); assertEquals( "bar", data.get( "foo" ) ); @@ -1411,7 +1408,7 @@ public void shouldBeAbleToGetNodeRepresentationFromIndexUri() throws Exception assertTrue( map.containsKey( "self" ) ); } - private void checkContentTypeCharsetUtf8(Response response) + private void checkContentTypeCharsetUtf8( Response response ) { assertTrue( response.getMetadata() .getFirst( HttpHeaders.CONTENT_TYPE ).toString().contains( "UTF-8" )); @@ -2004,7 +2001,7 @@ public void shouldReturnAllLabelsInUseInTheDatabase() throws JsonParseException assertThat( labels, not( hasItem( "DEAD" ) ) ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private void addRemoveAutoindexProperties( String type ) throws JsonParseException { Response response = service.getAutoIndexedProperties( type ); @@ -2058,7 +2055,7 @@ private void testAutoIndexEnableForType( String type ) assertFalse( Boolean.parseBoolean( entityAsString( response ) ) ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private String singleErrorCode( Response response ) throws JsonParseException { String json = entityAsString( response ); diff --git a/community/server/src/test/java/org/neo4j/server/rest/web/TransactionWrappingRestfulGraphDatabase.java b/community/server/src/test/java/org/neo4j/server/rest/web/TransactionWrappingRestfulGraphDatabase.java index 534e1c2fea6f3..d9f8d830fe73f 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/web/TransactionWrappingRestfulGraphDatabase.java +++ b/community/server/src/test/java/org/neo4j/server/rest/web/TransactionWrappingRestfulGraphDatabase.java @@ -690,10 +690,10 @@ public Response getNodeProperty( long public Response setNodeProperty( long nodeId, String key, String body ) { - try (Transaction transaction = graph.beginTx()) + try ( Transaction transaction = graph.beginTx() ) { Response response = restfulGraphDatabase.setNodeProperty( nodeId, key, body ); - if (response.getStatus() < 300) + if ( response.getStatus() < 300 ) { transaction.success(); } diff --git a/community/server/src/test/java/org/neo4j/server/scripting/TestScriptExecutorFactoryRepository.java b/community/server/src/test/java/org/neo4j/server/scripting/TestScriptExecutorFactoryRepository.java index 388cda2c9f9d0..6c6066cbaaa8b 100644 --- a/community/server/src/test/java/org/neo4j/server/scripting/TestScriptExecutorFactoryRepository.java +++ b/community/server/src/test/java/org/neo4j/server/scripting/TestScriptExecutorFactoryRepository.java @@ -19,20 +19,20 @@ */ package org.neo4j.server.scripting; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.mock; +import org.junit.Test; import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertThat; +import static org.mockito.Mockito.mock; public class TestScriptExecutorFactoryRepository { - @Test(expected = NoSuchScriptLanguageException.class) + @Test( expected = NoSuchScriptLanguageException.class ) public void shouldThrowNoSuchScriptLanguageExceptionForUnkownLanguages() throws Exception { // Given diff --git a/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestGlobalJavascriptInitializer.java b/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestGlobalJavascriptInitializer.java index ddec83e6aa227..36a4ca306dd04 100644 --- a/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestGlobalJavascriptInitializer.java +++ b/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestGlobalJavascriptInitializer.java @@ -24,7 +24,7 @@ public class TestGlobalJavascriptInitializer { - @Test(expected = RuntimeException.class ) + @Test( expected = RuntimeException.class ) public void shouldNotAllowChangingMode() throws Exception { // Given diff --git a/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestJavascriptSecurityRestrictions.java b/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestJavascriptSecurityRestrictions.java index 8602e2900b70e..ec8ac3adf272f 100644 --- a/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestJavascriptSecurityRestrictions.java +++ b/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestJavascriptSecurityRestrictions.java @@ -19,16 +19,17 @@ */ package org.neo4j.server.scripting.javascript; -import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; - import org.junit.BeforeClass; import org.junit.Test; + import org.neo4j.graphdb.traversal.Evaluation; import org.neo4j.server.rest.domain.EvaluationException; import org.neo4j.server.scripting.ScriptExecutor; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + public class TestJavascriptSecurityRestrictions { @@ -60,7 +61,7 @@ public void shouldBeAbleToAccessWhiteListedThings() throws Exception assertThat( (Evaluation) result, is(Evaluation.INCLUDE_AND_CONTINUE) ); } - @Test(expected = EvaluationException.class) + @Test( expected = EvaluationException.class ) public void shouldNotBeAbleToImportUnsafeClasses() throws Exception { // Given @@ -73,7 +74,7 @@ public void shouldNotBeAbleToImportUnsafeClasses() throws Exception executor.execute( null ); } - @Test(expected = EvaluationException.class) + @Test( expected = EvaluationException.class ) public void shouldNotBeAbleToUseReflectionToInstantiateThings() throws Exception { // Given diff --git a/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestWhiteListClassShutter.java b/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestWhiteListClassShutter.java index 2ae5ee7764188..f7a0f144c87fe 100644 --- a/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestWhiteListClassShutter.java +++ b/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestWhiteListClassShutter.java @@ -19,13 +19,13 @@ */ package org.neo4j.server.scripting.javascript; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import org.junit.Test; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; public class TestWhiteListClassShutter { @@ -36,7 +36,7 @@ public void shouldAllowWhiteListedClasses() throws Exception // Given Set whiteList = new HashSet(); whiteList.add( getClass().getName() ); - WhiteListClassShutter shutter = new WhiteListClassShutter(whiteList); + WhiteListClassShutter shutter = new WhiteListClassShutter( whiteList ); // When boolean visible = shutter.visibleToScripts( getClass().getName() ); @@ -48,7 +48,7 @@ public void shouldAllowWhiteListedClasses() throws Exception @Test public void shouldDisallowUnlistedClasses() throws Exception { - WhiteListClassShutter shutter = new WhiteListClassShutter(new HashSet()); + WhiteListClassShutter shutter = new WhiteListClassShutter( new HashSet() ); // When boolean visible = shutter.visibleToScripts( getClass().getName() ); diff --git a/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestWhiteListJavaWrapper.java b/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestWhiteListJavaWrapper.java index 56e08ecd211a3..619186d1fa603 100644 --- a/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestWhiteListJavaWrapper.java +++ b/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestWhiteListJavaWrapper.java @@ -53,11 +53,11 @@ public void exitContext() } } - @Test(expected = SecurityException.class) + @Test( expected = SecurityException.class ) public void shouldBlockAttemptsAtAccessingClassLoader() throws Exception { // Given - WhiteListJavaWrapper wrapper = new WhiteListJavaWrapper( new WhiteListClassShutter( new HashSet( ) )); + WhiteListJavaWrapper wrapper = new WhiteListJavaWrapper( new WhiteListClassShutter( new HashSet() ) ); // When wrapper.wrap( null, null, getClass().getClassLoader(), null ); @@ -70,7 +70,7 @@ public void shouldDownCastSubclassesToAllowedParentClass() throws Exception Set whiteList = new HashSet( ); whiteList.add( Object.class.getName() ); - WhiteListJavaWrapper wrapper = new WhiteListJavaWrapper( new WhiteListClassShutter( whiteList )); + WhiteListJavaWrapper wrapper = new WhiteListJavaWrapper( new WhiteListClassShutter( whiteList ) ); Context cx = Context.enter(); Scriptable scope = cx.initStandardObjects(); @@ -86,14 +86,14 @@ public void shouldDownCastSubclassesToAllowedParentClass() throws Exception assertThat( (UniqueTag) obj.get( "aGetter", scope ), is( UniqueTag.NOT_FOUND ) ); } - @Test(expected = SecurityException.class) + @Test( expected = SecurityException.class ) public void shouldThrowSecurityExceptionWhenAccessingLockedClasses() throws Exception { // Given Set whiteList = new HashSet( ); whiteList.add( Object.class.getName() ); - WhiteListJavaWrapper wrapper = new WhiteListJavaWrapper( new WhiteListClassShutter( whiteList )); + WhiteListJavaWrapper wrapper = new WhiteListJavaWrapper( new WhiteListClassShutter( whiteList ) ); Context cx = Context.enter(); Scriptable scope = cx.initStandardObjects(); @@ -110,8 +110,8 @@ public void shouldAllowAccessToWhiteListedClassMembers() throws Exception // other tests will already have configured global security settings that we cannot override. // Given - WhiteListJavaWrapper wrapper = new WhiteListJavaWrapper( new WhiteListClassShutter( - UserScriptClassWhiteList.getWhiteList() )); + WhiteListJavaWrapper wrapper = + new WhiteListJavaWrapper( new WhiteListClassShutter( UserScriptClassWhiteList.getWhiteList() ) ); Context cx = Context.enter(); Scriptable scope = cx.initStandardObjects(); diff --git a/community/server/src/test/java/org/neo4j/test/server/HTTP.java b/community/server/src/test/java/org/neo4j/test/server/HTTP.java index d10d4ddebd282..b1384e4145d8c 100644 --- a/community/server/src/test/java/org/neo4j/test/server/HTTP.java +++ b/community/server/src/test/java/org/neo4j/test/server/HTTP.java @@ -244,7 +244,7 @@ public String location() "unable to provide location. Status code was: " + status() ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public T content() { try @@ -267,7 +267,7 @@ public String stringFromContent( String key ) throws JsonParseException return get(key).asText(); } - public JsonNode get(String fieldName) throws JsonParseException + public JsonNode get( String fieldName ) throws JsonParseException { return JsonHelper.jsonNode( entity ).get( fieldName ); } diff --git a/community/shell/src/main/java/org/neo4j/shell/AppCommandParser.java b/community/shell/src/main/java/org/neo4j/shell/AppCommandParser.java index 907c2200a46c7..a8a800afb4103 100644 --- a/community/shell/src/main/java/org/neo4j/shell/AppCommandParser.java +++ b/community/shell/src/main/java/org/neo4j/shell/AppCommandParser.java @@ -230,14 +230,14 @@ private void assertHasIndex( String[] array, int index, String message ) throws private static int findNextWhiteSpaceOrLeftParenthesis( String line, int fromIndex ) { int indexOfWhiteSpace = line.indexOf( ' ', fromIndex ); - if (indexOfWhiteSpace == - 1) + if ( indexOfWhiteSpace == -1 ) { indexOfWhiteSpace = line.indexOf( '\t', fromIndex ); } //allow using both create () and create() int indexOfLeftParenthesis = line.indexOf( '(', fromIndex ); - if (indexOfLeftParenthesis != -1) + if ( indexOfLeftParenthesis != -1 ) { return Math.min(indexOfWhiteSpace, indexOfLeftParenthesis); } diff --git a/community/shell/src/main/java/org/neo4j/shell/StartClient.java b/community/shell/src/main/java/org/neo4j/shell/StartClient.java index 5c24d73d80c96..e7af8e3c8b6ab 100644 --- a/community/shell/src/main/java/org/neo4j/shell/StartClient.java +++ b/community/shell/src/main/java/org/neo4j/shell/StartClient.java @@ -554,7 +554,7 @@ private static class ShellExecutionFailureException extends RuntimeException ShellExecutionFailureException( Throwable cause, Args args ) { - super(cause); + super( cause ); this.cause = cause; this.args = args; } diff --git a/community/shell/src/main/java/org/neo4j/shell/apps/Alias.java b/community/shell/src/main/java/org/neo4j/shell/apps/Alias.java index 09c655941f28e..670a86d90d832 100644 --- a/community/shell/src/main/java/org/neo4j/shell/apps/Alias.java +++ b/community/shell/src/main/java/org/neo4j/shell/apps/Alias.java @@ -28,7 +28,7 @@ import org.neo4j.shell.Session; import org.neo4j.shell.impl.AbstractApp; -@Service.Implementation(App.class) +@Service.Implementation( App.class ) public class Alias extends AbstractApp { diff --git a/community/shell/src/main/java/org/neo4j/shell/apps/Export.java b/community/shell/src/main/java/org/neo4j/shell/apps/Export.java index 045a60fab5eab..fc2d164f10318 100644 --- a/community/shell/src/main/java/org/neo4j/shell/apps/Export.java +++ b/community/shell/src/main/java/org/neo4j/shell/apps/Export.java @@ -36,7 +36,7 @@ * Mimics the Bash application "export" and uses the client session * {@link Session} as the data container. */ -@Service.Implementation(App.class) +@Service.Implementation( App.class ) public class Export extends AbstractApp { @Override diff --git a/community/shell/src/main/java/org/neo4j/shell/impl/RemotelyAvailableServer.java b/community/shell/src/main/java/org/neo4j/shell/impl/RemotelyAvailableServer.java index 616cd4d024f2d..c859146f78849 100644 --- a/community/shell/src/main/java/org/neo4j/shell/impl/RemotelyAvailableServer.java +++ b/community/shell/src/main/java/org/neo4j/shell/impl/RemotelyAvailableServer.java @@ -91,7 +91,7 @@ public void shutdown() throws RemoteException { try { - if (this.location != null) + if ( this.location != null ) { this.location.unbind(); } diff --git a/community/shell/src/main/java/org/neo4j/shell/impl/ShellBootstrap.java b/community/shell/src/main/java/org/neo4j/shell/impl/ShellBootstrap.java index c92940d700c25..177299d34eb50 100644 --- a/community/shell/src/main/java/org/neo4j/shell/impl/ShellBootstrap.java +++ b/community/shell/src/main/java/org/neo4j/shell/impl/ShellBootstrap.java @@ -25,8 +25,8 @@ import java.rmi.RemoteException; import java.util.Base64; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.shell.ShellSettings; import org.neo4j.shell.kernel.GraphDatabaseShellServer; @@ -71,7 +71,7 @@ public String serialize() return Base64.getEncoder().encodeToString( os.toByteArray() ); } - @SuppressWarnings("boxing") + @SuppressWarnings( "boxing" ) GraphDatabaseShellServer load( GraphDatabaseAPI graphDb ) throws RemoteException { if ( !enable ) diff --git a/community/shell/src/main/java/org/neo4j/shell/impl/ShellServerExtensionFactory.java b/community/shell/src/main/java/org/neo4j/shell/impl/ShellServerExtensionFactory.java index d803e6c904bee..c5b6a1e4726de 100644 --- a/community/shell/src/main/java/org/neo4j/shell/impl/ShellServerExtensionFactory.java +++ b/community/shell/src/main/java/org/neo4j/shell/impl/ShellServerExtensionFactory.java @@ -20,14 +20,14 @@ package org.neo4j.shell.impl; import org.neo4j.helpers.Service; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.spi.KernelContext; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.lifecycle.Lifecycle; import org.neo4j.shell.ShellSettings; -@Service.Implementation(KernelExtensionFactory.class) +@Service.Implementation( KernelExtensionFactory.class ) public final class ShellServerExtensionFactory extends KernelExtensionFactory { static final String KEY = "shell"; diff --git a/community/shell/src/main/java/org/neo4j/shell/impl/ShellTabCompleter.java b/community/shell/src/main/java/org/neo4j/shell/impl/ShellTabCompleter.java index 6ebfdc574e84f..cc58b17f88d2a 100644 --- a/community/shell/src/main/java/org/neo4j/shell/impl/ShellTabCompleter.java +++ b/community/shell/src/main/java/org/neo4j/shell/impl/ShellTabCompleter.java @@ -29,7 +29,7 @@ import org.neo4j.shell.ShellException; import org.neo4j.shell.TabCompletion; -@SuppressWarnings("UnusedDeclaration") +@SuppressWarnings( "UnusedDeclaration" ) /** * This class is instantiated by reflection (in {@link JLineConsole#newConsoleOrNullIfNotFound}) in order to ensure * that there is no hard dependency on jLine and the console can run in degraded form without it. diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java b/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java index 6ac6da648cdde..5eb5dee345ed6 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java @@ -729,13 +729,13 @@ public Map getConfiguration( Index public String setConfiguration( Index index, String key, String value ) { - throw new IllegalStateException("Database is in read-only mode"); + throw new IllegalStateException( "Database is in read-only mode" ); } @Override public String removeConfiguration( Index index, String key ) { - throw new IllegalStateException("Database is in read-only mode"); + throw new IllegalStateException( "Database is in read-only mode" ); } @Override diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Begin.java b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Begin.java index af09b581f1717..b1c3d12f86f03 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Begin.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Begin.java @@ -32,7 +32,7 @@ import org.neo4j.shell.ShellException; import org.neo4j.shell.kernel.GraphDatabaseShellServer; -@Service.Implementation(App.class) +@Service.Implementation( App.class ) public class Begin extends NonTransactionProvidingApp { private static final String TRANSACTION = "TRANSACTION"; diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Commit.java b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Commit.java index 91a71e7269cbf..d056dd5b53e36 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Commit.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Commit.java @@ -31,7 +31,7 @@ import org.neo4j.shell.ShellException; import org.neo4j.shell.Variables; -@Service.Implementation(App.class) +@Service.Implementation( App.class ) public class Commit extends NonTransactionProvidingApp { @Override diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Rollback.java b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Rollback.java index 58a68a2b3fb57..0a1d059d308b1 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Rollback.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Rollback.java @@ -32,7 +32,7 @@ import org.neo4j.shell.ShellException; import org.neo4j.shell.Variables; -@Service.Implementation(App.class) +@Service.Implementation( App.class ) public class Rollback extends NonTransactionProvidingApp { @Override diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Explain.java b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Explain.java index b2d9089a3bc4e..5529e75faf1e9 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Explain.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Explain.java @@ -22,7 +22,7 @@ import org.neo4j.helpers.Service; import org.neo4j.shell.App; -@Service.Implementation(App.class) +@Service.Implementation( App.class ) public class Explain extends Start { @Override diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Exporter.java b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Exporter.java index 6c3e24e3e79fb..7848661471cb9 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Exporter.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Exporter.java @@ -32,7 +32,7 @@ public class Exporter { private final SubGraphExporter exporter; - Exporter(SubGraph graph) + Exporter( SubGraph graph ) { exporter = new SubGraphExporter( graph ); } diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Using.java b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Using.java index fa49e99de23df..227fb9e235c12 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Using.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Using.java @@ -22,7 +22,7 @@ import org.neo4j.helpers.Service; import org.neo4j.shell.App; -@Service.Implementation(App.class) +@Service.Implementation( App.class ) public class Using extends Start { } diff --git a/community/shell/src/test/java/org/neo4j/shell/SessionTest.java b/community/shell/src/test/java/org/neo4j/shell/SessionTest.java index 6bb4133d62061..34e20f0041906 100644 --- a/community/shell/src/test/java/org/neo4j/shell/SessionTest.java +++ b/community/shell/src/test/java/org/neo4j/shell/SessionTest.java @@ -19,11 +19,11 @@ */ package org.neo4j.shell; -import static org.junit.Assert.assertEquals; - import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class SessionTest { private Session session; @@ -34,7 +34,7 @@ public void setUp() throws Exception session = new Session( 1 ); } - @Test(expected = ShellException.class) + @Test( expected = ShellException.class ) public void cannotSetInvalidVariableName() throws ShellException { session.set( "foo bar", 42 ); @@ -46,7 +46,7 @@ public void canSetVariableName() throws ShellException session.set( "_foobar", 42 ); } - @Test(expected = ShellException.class) + @Test( expected = ShellException.class ) public void cannotGetInvalidVariableName() throws ShellException { session.get( "foo bar" ); @@ -59,7 +59,7 @@ public void canGetVariableName() throws ShellException assertEquals( 42, session.get( "_foobar" )); } - @Test(expected = ShellException.class) + @Test( expected = ShellException.class ) public void cannotRemoveInvalidVariableName() throws ShellException { session.remove( "foo bar" ); diff --git a/community/udc/src/main/java/org/neo4j/ext/udc/UdcSettings.java b/community/udc/src/main/java/org/neo4j/ext/udc/UdcSettings.java index 78581f16420cf..0c29b7039077e 100644 --- a/community/udc/src/main/java/org/neo4j/ext/udc/UdcSettings.java +++ b/community/udc/src/main/java/org/neo4j/ext/udc/UdcSettings.java @@ -22,10 +22,10 @@ import java.util.function.Function; import org.neo4j.configuration.Description; +import org.neo4j.configuration.Internal; import org.neo4j.configuration.LoadableConfig; import org.neo4j.graphdb.config.Setting; import org.neo4j.helpers.HostnamePort; -import org.neo4j.configuration.Internal; import org.neo4j.kernel.configuration.Settings; import static org.neo4j.kernel.configuration.Settings.ANY; @@ -80,7 +80,7 @@ private enum Enabled implements Function * Explicitly allocate a String here so that we know it is unique and can do identity equality comparisons on it * to detect that the default value has been used. */ - @SuppressWarnings("RedundantStringConstructorCall") + @SuppressWarnings( "RedundantStringConstructorCall" ) static final String AS_DEFAULT_VALUE = new String( TRUE ); @Override diff --git a/community/udc/src/main/java/org/neo4j/ext/udc/impl/UdcKernelExtensionFactory.java b/community/udc/src/main/java/org/neo4j/ext/udc/impl/UdcKernelExtensionFactory.java index 1310b7452860e..a712e3403b770 100644 --- a/community/udc/src/main/java/org/neo4j/ext/udc/impl/UdcKernelExtensionFactory.java +++ b/community/udc/src/main/java/org/neo4j/ext/udc/impl/UdcKernelExtensionFactory.java @@ -44,7 +44,7 @@ * testing and short-run applications. Subsequent updates are made at regular * intervals. Both times are specified in milliseconds. */ -@Service.Implementation(KernelExtensionFactory.class) +@Service.Implementation( KernelExtensionFactory.class ) public class UdcKernelExtensionFactory extends KernelExtensionFactory { static final String KEY = "kernel udc"; diff --git a/community/udc/src/test/java/org/neo4j/ext/udc/UdcSettingsTest.java b/community/udc/src/test/java/org/neo4j/ext/udc/UdcSettingsTest.java index 5da3fc47a5fec..7e9eeb0d7d8c1 100644 --- a/community/udc/src/test/java/org/neo4j/ext/udc/UdcSettingsTest.java +++ b/community/udc/src/test/java/org/neo4j/ext/udc/UdcSettingsTest.java @@ -35,7 +35,7 @@ import static org.neo4j.ext.udc.UdcSettings.udc_enabled; import static org.neo4j.helpers.Configuration.DEFAULT; -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class UdcSettingsTest { public static final String UDC_DISABLE = "dbms.udc.disable"; diff --git a/community/unsafe/src/main/java/org/neo4j/unsafe/impl/internal/dragons/FeatureToggles.java b/community/unsafe/src/main/java/org/neo4j/unsafe/impl/internal/dragons/FeatureToggles.java index adaf234a32e89..b91878a6f5564 100644 --- a/community/unsafe/src/main/java/org/neo4j/unsafe/impl/internal/dragons/FeatureToggles.java +++ b/community/unsafe/src/main/java/org/neo4j/unsafe/impl/internal/dragons/FeatureToggles.java @@ -110,7 +110,7 @@ public static int getInteger( Class location, String name, int defaultValue ) * @param defaultValue the default value of the flag if the system property is not assigned. * @return the parsed value of the system property, or the default value. */ - public static double getDouble(Class location, String name, double defaultValue) + public static double getDouble( Class location, String name, double defaultValue ) { try { diff --git a/community/unsafe/src/main/java/org/neo4j/unsafe/impl/internal/dragons/UnsafeUtil.java b/community/unsafe/src/main/java/org/neo4j/unsafe/impl/internal/dragons/UnsafeUtil.java index 5e75b118a2feb..87d254f694262 100644 --- a/community/unsafe/src/main/java/org/neo4j/unsafe/impl/internal/dragons/UnsafeUtil.java +++ b/community/unsafe/src/main/java/org/neo4j/unsafe/impl/internal/dragons/UnsafeUtil.java @@ -434,7 +434,7 @@ private static void doCheckFree( long pointer ) if ( size == null ) { StringBuilder sb = new StringBuilder( format( "Bad free: 0x%x, valid pointers are:", pointer ) ); - pointers.forEach( (k,v) -> sb.append( '\n' ).append( k ) ); + pointers.forEach( ( k, v ) -> sb.append( '\n' ).append( k ) ); throw new AssertionError( sb.toString() ); } long count = freeTraceCounter.getAndIncrement(); diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java b/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java index ba21b50e8d58c..f5b0622f34fd9 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java @@ -132,7 +132,7 @@ public boolean isConsistent() new Monitors() ); } - BackupService( Supplier fileSystemSupplier, LogProvider logProvider, Monitors monitors) + BackupService( Supplier fileSystemSupplier, LogProvider logProvider, Monitors monitors ) { this.fileSystemSupplier = fileSystemSupplier; this.logProvider = logProvider; diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupExtensionFactory.java b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupExtensionFactory.java index 8be3c3c7aa899..ef2fd6c28960c 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupExtensionFactory.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupExtensionFactory.java @@ -38,7 +38,7 @@ import org.neo4j.kernel.lifecycle.Lifecycle; import org.neo4j.kernel.monitoring.Monitors; -@Service.Implementation(KernelExtensionFactory.class) +@Service.Implementation( KernelExtensionFactory.class ) public class OnlineBackupExtensionFactory extends KernelExtensionFactory { static final String KEY = "online backup"; diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupSettings.java b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupSettings.java index 83105af44bc70..5c245f034e750 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupSettings.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupSettings.java @@ -35,10 +35,10 @@ @Description( "Online backup configuration settings" ) public class OnlineBackupSettings implements LoadableConfig { - @Description("Enable support for running online backups") + @Description( "Enable support for running online backups" ) public static final Setting online_backup_enabled = setting( "dbms.backup.enabled", BOOLEAN, TRUE ); - @Description("Listening server for online backups") + @Description( "Listening server for online backups" ) public static final Setting online_backup_server = setting( "dbms.backup.address", HOSTNAME_PORT, "127.0.0.1:6362-6372" ); } diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/BackupProtocolTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/BackupProtocolTest.java index 3c2f11b99177a..0c1d33e94248e 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupProtocolTest.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupProtocolTest.java @@ -83,8 +83,8 @@ private void shouldGatherForensicsInFullBackupRequest( boolean forensics ) throw BackupClient client = life.add( new BackupClient( host, port, null, NullLogProvider.getInstance(), storeId, 10_000, mock( ResponseUnpacker.class ), mock( ByteCounterMonitor.class ), mock( RequestMonitor.class ), reader ) ); ControlledBackupInterface backup = new ControlledBackupInterface(); - life.add( new BackupServer( backup, new HostnamePort( host, port ), NullLogProvider.getInstance(), mock( ByteCounterMonitor.class ), - mock( RequestMonitor.class )) ); + life.add( new BackupServer( backup, new HostnamePort( host, port ), NullLogProvider.getInstance(), + mock( ByteCounterMonitor.class ), mock( RequestMonitor.class ) ) ); life.start(); try diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolUrisTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolUrisTest.java index d154da5f149c7..720b9a047ee76 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolUrisTest.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolUrisTest.java @@ -41,11 +41,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; - -@RunWith(Enclosed.class) +@RunWith( Enclosed.class ) public class BackupToolUrisTest { - @RunWith(Parameterized.class) + @RunWith( Parameterized.class ) public static class ValidUriTests extends UriTests { public ValidUriTests( String host, Integer port ) @@ -103,7 +102,7 @@ public void shouldExecuteBackupWithValidUri() throws Exception } } - @RunWith(Parameterized.class) + @RunWith( Parameterized.class ) public static class InvalidUriTests extends UriTests { public InvalidUriTests( String host, Integer port ) @@ -152,7 +151,7 @@ public void shouldThrowForInvalidUri() throws Exception } } - @RunWith(Parameterized.class) + @RunWith( Parameterized.class ) public static class IPv6UriTests extends UriTests { public IPv6UriTests( String host, Integer port ) diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupTest.java index 216f60e187693..817302a6a2e30 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupTest.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupTest.java @@ -142,7 +142,7 @@ public void shouldNotServeTransactionsWithInvalidHighIds() throws Exception private DbRepresentation createInitialDataSet( File path ) { db = startGraphDatabase( path ); - try (Transaction tx = db.beginTx()) + try ( Transaction tx = db.beginTx() ) { db.createNode().setProperty( "name", "Goofy" ); Node donald = db.createNode(); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchUpResponseCallback.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchUpResponseCallback.java index 1be0f9f01a164..c7306976555d6 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchUpResponseCallback.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchUpResponseCallback.java @@ -44,5 +44,5 @@ public interface CatchUpResponseCallback void onGetStoreIdResponse( CompletableFuture signal, GetStoreIdResponse response ); - void onCoreSnapshot(CompletableFuture signal, CoreSnapshot coreSnapshot ); + void onCoreSnapshot( CompletableFuture signal, CoreSnapshot coreSnapshot ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/TrackingResponseHandler.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/TrackingResponseHandler.java index c15083dce17d6..815d4d8207bce 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/TrackingResponseHandler.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/TrackingResponseHandler.java @@ -32,7 +32,7 @@ import org.neo4j.causalclustering.catchup.tx.TxStreamFinishedResponse; import org.neo4j.causalclustering.core.state.snapshot.CoreSnapshot; -@SuppressWarnings("unchecked") +@SuppressWarnings( "unchecked" ) class TrackingResponseHandler implements CatchUpResponseHandler { private CatchUpResponseCallback delegate; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyFinishedResponse.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyFinishedResponse.java index 422fc30b8ceba..9d7c3ff6dec60 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyFinishedResponse.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyFinishedResponse.java @@ -53,12 +53,15 @@ Status status() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } StoreCopyFinishedResponse that = (StoreCopyFinishedResponse) o; - return lastCommittedTxBeforeStoreCopy == that.lastCommittedTxBeforeStoreCopy && - status == that.status; + return lastCommittedTxBeforeStoreCopy == that.lastCommittedTxBeforeStoreCopy && status == that.status; } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/tx/TxPullClient.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/tx/TxPullClient.java index 0ee9f4ebed74a..3b2b0fe6bf4ce 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/tx/TxPullClient.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/tx/TxPullClient.java @@ -62,7 +62,7 @@ public void onTxPullResponse( CompletableFuture signal, public void onTxStreamFinishedResponse( CompletableFuture signal, TxStreamFinishedResponse response ) { - signal.complete( new TxPullRequestResult(response.status(), lastTxIdReceived )); + signal.complete( new TxPullRequestResult( response.status(), lastTxIdReceived ) ); } } ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/tx/TxStreamFinishedResponse.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/tx/TxStreamFinishedResponse.java index 17b584bf2500a..3b6eee787d660 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/tx/TxStreamFinishedResponse.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/tx/TxStreamFinishedResponse.java @@ -23,8 +23,6 @@ import org.neo4j.causalclustering.catchup.CatchupResult; -import static java.lang.String.format; - public class TxStreamFinishedResponse { private final CatchupResult status; @@ -50,12 +48,15 @@ public long latestTxId() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } TxStreamFinishedResponse that = (TxStreamFinishedResponse) o; - return latestTxId == that.latestTxId && - status == that.status; + return latestTxId == that.latestTxId && status == that.status; } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/LeaderContext.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/LeaderContext.java index c2892f1143487..0055561bc8cd7 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/LeaderContext.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/LeaderContext.java @@ -19,7 +19,7 @@ */ package org.neo4j.causalclustering.core.consensus; -import static java.lang.String.*; +import static java.lang.String.format; /** * Consistent leader state at a point in time. @@ -39,16 +39,21 @@ public LeaderContext( long term, long commitIndex ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } LeaderContext that = (LeaderContext) o; if ( term != that.term ) - { return false; } + { + return false; + } return commitIndex == that.commitIndex; - } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/RaftMessages.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/RaftMessages.java index 9ee2414eb82f9..5ae3bad5ea637 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/RaftMessages.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/RaftMessages.java @@ -25,11 +25,11 @@ import java.util.List; import java.util.Objects; -import org.neo4j.causalclustering.identity.ClusterId; -import org.neo4j.causalclustering.messaging.Message; import org.neo4j.causalclustering.core.consensus.log.RaftLogEntry; import org.neo4j.causalclustering.core.replication.ReplicatedContent; +import org.neo4j.causalclustering.identity.ClusterId; import org.neo4j.causalclustering.identity.MemberId; +import org.neo4j.causalclustering.messaging.Message; import static java.lang.String.format; import static org.neo4j.causalclustering.core.consensus.RaftMessages.Type.HEARTBEAT_RESPONSE; @@ -644,11 +644,17 @@ public void add( ReplicatedContent content ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } if ( !super.equals( o ) ) - { return false; } + { + return false; + } BatchRequest batchRequest = (BatchRequest) o; return Objects.equals( list, batchRequest.list ); } @@ -744,11 +750,17 @@ public long pruneIndex() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } if ( !super.equals( o ) ) - { return false; } + { + return false; + } PruneRequest that = (PruneRequest) o; return pruneIndex == that.pruneIndex; } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/LogPosition.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/LogPosition.java index 278e2d0a33976..7f8ae54f35cc5 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/LogPosition.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/LogPosition.java @@ -36,12 +36,15 @@ public LogPosition( long logIndex, long byteOffset ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } LogPosition position = (LogPosition) o; - return logIndex == position.logIndex && - byteOffset == position.byteOffset; + return logIndex == position.logIndex && byteOffset == position.byteOffset; } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/monitoring/RaftLogAppendIndexMonitor.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/monitoring/RaftLogAppendIndexMonitor.java index 17f82aea03a8e..70ff38f0f3325 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/monitoring/RaftLogAppendIndexMonitor.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/monitoring/RaftLogAppendIndexMonitor.java @@ -22,6 +22,7 @@ public interface RaftLogAppendIndexMonitor { long appendIndex(); - void appendIndex(long appendIndex); + + void appendIndex( long appendIndex ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/monitoring/RaftLogCommitIndexMonitor.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/monitoring/RaftLogCommitIndexMonitor.java index 63def07652f2d..f061b8b53af04 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/monitoring/RaftLogCommitIndexMonitor.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/monitoring/RaftLogCommitIndexMonitor.java @@ -22,6 +22,7 @@ public interface RaftLogCommitIndexMonitor { long commitIndex(); - void commitIndex(long commitIndex); + + void commitIndex( long commitIndex ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/DumpSegmentedRaftLog.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/DumpSegmentedRaftLog.java index 11e36bc4d0789..c9977516b8ded 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/DumpSegmentedRaftLog.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/DumpSegmentedRaftLog.java @@ -59,7 +59,7 @@ private int dump( String filenameOrDirectory, PrintStream out ) new RecoveryProtocol( fileSystem, fileNames, readerPool, marshal, logProvider ); Segments segments = recoveryProtocol.run().segments; - segments.visit( (segment) -> + segments.visit( ( segment ) -> { logsFound[0]++; out.println( "=== " + segment.getFilename() + " ===" ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/OpenEndRangeMap.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/OpenEndRangeMap.java index 11fb9b84e9e2a..a631df1697ce2 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/OpenEndRangeMap.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/OpenEndRangeMap.java @@ -69,9 +69,13 @@ Optional value() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } ValueRange that = (ValueRange) o; return Objects.equals( limit, that.limit ) && Objects.equals( value, that.value ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/SegmentHeader.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/SegmentHeader.java index 3fb621bf76b7a..04163f29404d0 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/SegmentHeader.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/SegmentHeader.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.Objects; -import org.neo4j.causalclustering.messaging.EndOfStreamException; import org.neo4j.causalclustering.core.state.storage.SafeChannelMarshal; +import org.neo4j.causalclustering.messaging.EndOfStreamException; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; @@ -71,9 +71,13 @@ public long prevTerm() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } SegmentHeader that = (SegmentHeader) o; return prevFileLastIndex == that.prevFileLastIndex && version == that.version && diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/membership/MembershipEntry.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/membership/MembershipEntry.java index 6d2836b7d9e75..6d281791fd7aa 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/membership/MembershipEntry.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/membership/MembershipEntry.java @@ -24,9 +24,9 @@ import java.util.Objects; import java.util.Set; -import org.neo4j.causalclustering.messaging.EndOfStreamException; import org.neo4j.causalclustering.core.state.storage.SafeStateMarshal; import org.neo4j.causalclustering.identity.MemberId; +import org.neo4j.causalclustering.messaging.EndOfStreamException; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; @@ -58,12 +58,15 @@ public Set members() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } MembershipEntry that = (MembershipEntry) o; - return logIndex == that.logIndex && - Objects.equals( members, that.members ); + return logIndex == that.logIndex && Objects.equals( members, that.members ); } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/membership/RaftMembershipState.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/membership/RaftMembershipState.java index bf414c7108660..afc4f37bc93cd 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/membership/RaftMembershipState.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/membership/RaftMembershipState.java @@ -156,13 +156,16 @@ Set getLatest() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } RaftMembershipState that = (RaftMembershipState) o; - return ordinal == that.ordinal && - Objects.equals( committed, that.committed ) && - Objects.equals( appended, that.appended ); + return ordinal == that.ordinal && Objects.equals( committed, that.committed ) && + Objects.equals( appended, that.appended ); } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/AppendLogEntry.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/AppendLogEntry.java index e9aee529dff00..088e38fed7f66 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/AppendLogEntry.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/AppendLogEntry.java @@ -64,12 +64,15 @@ public void dispatch( Handler handler ) throws IOException public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } AppendLogEntry that = (AppendLogEntry) o; - return index == that.index && - Objects.equals( entry, that.entry ); + return index == that.index && Objects.equals( entry, that.entry ); } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/BatchAppendLogEntries.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/BatchAppendLogEntries.java index b780bc663dfa9..98e1cf142d984 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/BatchAppendLogEntries.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/BatchAppendLogEntries.java @@ -74,13 +74,15 @@ public void applyTo( InFlightMap inFlightMap, Log log ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } BatchAppendLogEntries that = (BatchAppendLogEntries) o; - return baseIndex == that.baseIndex && - offset == that.offset && - Arrays.equals( entries, that.entries ); + return baseIndex == that.baseIndex && offset == that.offset && Arrays.equals( entries, that.entries ); } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/PruneLogCommand.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/PruneLogCommand.java index 5a8422a633047..352bc15e0d4e7 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/PruneLogCommand.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/PruneLogCommand.java @@ -58,9 +58,13 @@ public void applyTo( InFlightMap inFlightMap, Log log ) throws IOE public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } PruneLogCommand that = (PruneLogCommand) o; return pruneIndex == that.pruneIndex; } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/TruncateLogCommand.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/TruncateLogCommand.java index cf4ab9a242834..6613feb26d063 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/TruncateLogCommand.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/outcome/TruncateLogCommand.java @@ -59,9 +59,13 @@ public void applyTo( InFlightMap inFlightMap, Log log ) throws IOE public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } TruncateLogCommand that = (TruncateLogCommand) o; return fromIndex == that.fromIndex; } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/session/GlobalSession.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/session/GlobalSession.java index 126848bebc0fd..14e63779b8472 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/session/GlobalSession.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/session/GlobalSession.java @@ -50,16 +50,21 @@ public MemberId owner() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } GlobalSession that = (GlobalSession) o; if ( !sessionId.equals( that.sessionId ) ) - { return false; } + { + return false; + } return owner.equals( that.owner ); - } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/session/LocalOperationId.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/session/LocalOperationId.java index 8225ee3e68338..c237f628f4a9d 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/session/LocalOperationId.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/session/LocalOperationId.java @@ -47,16 +47,21 @@ public long sequenceNumber() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } LocalOperationId that = (LocalOperationId) o; if ( localSessionId != that.localSessionId ) - { return false; } + { + return false; + } return sequenceNumber == that.sequenceNumber; - } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/session/LocalSession.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/session/LocalSession.java index b2b6927f1cf61..949a5aba79aad 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/session/LocalSession.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/session/LocalSession.java @@ -42,14 +42,16 @@ protected LocalOperationId nextOperationId() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } LocalSession that = (LocalSession) o; - return localSessionId == that.localSessionId; - } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/server/BatchingMessageHandler.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/server/BatchingMessageHandler.java index 03ba5159704e2..d9ae05ea0b42b 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/server/BatchingMessageHandler.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/server/BatchingMessageHandler.java @@ -124,7 +124,7 @@ private void collateAndHandleBatch( List bat for ( RaftMessages.ClusterIdAwareMessage clusterIdAwareMessage : batch ) { - if ( batchRequest != null && !clusterIdAwareMessage.clusterId().equals( clusterId )) + if ( batchRequest != null && !clusterIdAwareMessage.clusterId().equals( clusterId ) ) { handler.handle( new RaftMessages.ClusterIdAwareMessage( clusterId, batchRequest ) ); batchRequest = null; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/StateRecoveryManager.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/StateRecoveryManager.java index ffd1903d2449f..6053f9dd543f6 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/StateRecoveryManager.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/StateRecoveryManager.java @@ -74,7 +74,7 @@ public RecoveryStatus recover( File fileA, File fileB ) throws IOExceptio STATE a = readLastEntryFrom( fileA ); STATE b = readLastEntryFrom( fileB ); - if ( a == null && b == null) + if ( a == null && b == null ) { throw new IllegalStateException( "no recoverable state" ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/id/ReplicatedIdAllocationRequest.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/id/ReplicatedIdAllocationRequest.java index 54180ac857133..8823e4363f6ad 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/id/ReplicatedIdAllocationRequest.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/id/ReplicatedIdAllocationRequest.java @@ -21,9 +21,9 @@ import java.util.function.Consumer; -import org.neo4j.causalclustering.core.state.machines.tx.CoreReplicatedContent; import org.neo4j.causalclustering.core.state.CommandDispatcher; import org.neo4j.causalclustering.core.state.Result; +import org.neo4j.causalclustering.core.state.machines.tx.CoreReplicatedContent; import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.kernel.impl.store.id.IdType; @@ -50,20 +50,29 @@ public ReplicatedIdAllocationRequest( MemberId owner, IdType idType, long idRang public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } ReplicatedIdAllocationRequest that = (ReplicatedIdAllocationRequest) o; if ( idRangeStart != that.idRangeStart ) - { return false; } + { + return false; + } if ( idRangeLength != that.idRangeLength ) - { return false; } + { + return false; + } if ( !owner.equals( that.owner ) ) - { return false; } + { + return false; + } return idType == that.idType; - } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/locks/LeaderOnlyLockManager.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/locks/LeaderOnlyLockManager.java index 60417b533cb4d..2a8e2bd89029e 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/locks/LeaderOnlyLockManager.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/locks/LeaderOnlyLockManager.java @@ -130,7 +130,7 @@ private synchronized int acquireTokenOrThrow() else { throw new AcquireLockTimeoutException( "Failed to acquire lock token. Was taken by another candidate.", - NotALeader); + NotALeader ); } } catch ( ExecutionException e ) diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/locks/ReplicatedLockTokenSerializer.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/locks/ReplicatedLockTokenSerializer.java index 7d8e2062046cf..703016a5164a2 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/locks/ReplicatedLockTokenSerializer.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/locks/ReplicatedLockTokenSerializer.java @@ -28,8 +28,7 @@ public class ReplicatedLockTokenSerializer { - public static void marshal( ReplicatedLockTokenRequest tokenRequest, WritableChannel channel) - throws IOException + public static void marshal( ReplicatedLockTokenRequest tokenRequest, WritableChannel channel ) throws IOException { channel.putInt( tokenRequest.id() ); new MemberId.Marshal().marshal( tokenRequest.owner(), channel ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/locks/ReplicatedLockTokenStateMachine.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/locks/ReplicatedLockTokenStateMachine.java index 1fdf8f80d950a..bdf18bdb01c8e 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/locks/ReplicatedLockTokenStateMachine.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/locks/ReplicatedLockTokenStateMachine.java @@ -72,7 +72,7 @@ public long lastAppliedIndex() private ReplicatedLockTokenState state() { - if ( state == null) + if ( state == null ) { state = storage.getInitialState(); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenRequest.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenRequest.java index 48d83652c1e37..3e32f498f6785 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenRequest.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenRequest.java @@ -22,9 +22,9 @@ import java.util.Arrays; import java.util.function.Consumer; -import org.neo4j.causalclustering.core.state.machines.tx.CoreReplicatedContent; import org.neo4j.causalclustering.core.state.CommandDispatcher; import org.neo4j.causalclustering.core.state.Result; +import org.neo4j.causalclustering.core.state.machines.tx.CoreReplicatedContent; public class ReplicatedTokenRequest implements CoreReplicatedContent { @@ -58,16 +58,24 @@ byte[] commandBytes() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } ReplicatedTokenRequest that = (ReplicatedTokenRequest) o; if ( type != that.type ) - { return false; } + { + return false; + } if ( !tokenName.equals( that.tokenName ) ) - { return false; } + { + return false; + } return Arrays.equals( commandBytes, that.commandBytes ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransaction.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransaction.java index 6dcd5d8099fcb..70ee8956b2a07 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransaction.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransaction.java @@ -49,9 +49,13 @@ public void dispatch( CommandDispatcher commandDispatcher, long commandIndex, Co public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } ReplicatedTransaction that = (ReplicatedTransaction) o; return Arrays.equals( txBytes, that.txBytes ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachine.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachine.java index 93316e176d93b..068b75de9f2d1 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachine.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachine.java @@ -61,7 +61,7 @@ public synchronized void installCommitProcess( TransactionCommitProcess commitPr { this.lastCommittedIndex = lastCommittedIndex; log.info( format("Updated lastCommittedIndex to %d", lastCommittedIndex) ); - this.queue = new TransactionQueue( maxBatchSize, (first, last) -> + this.queue = new TransactionQueue( maxBatchSize, ( first, last ) -> commitProcess.commit( first, CommitEvent.NULL, TransactionApplicationMode.EXTERNAL ) ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/ClientConnectorAddresses.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/ClientConnectorAddresses.java index c0cd468b74b65..53e7883c5ea0e 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/ClientConnectorAddresses.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/ClientConnectorAddresses.java @@ -52,7 +52,7 @@ static ClientConnectorAddresses extractFromConfig( Config config ) List boltConnectors = config.enabledBoltConnectors(); - if (boltConnectors.isEmpty()) + if ( boltConnectors.isEmpty() ) { throw new IllegalArgumentException( "A Bolt connector must be configured to run a cluster" ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/identity/ClusterId.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/identity/ClusterId.java index 48f6eee356e3d..4cda99d167496 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/identity/ClusterId.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/identity/ClusterId.java @@ -40,9 +40,13 @@ public ClusterId( UUID uuid ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } ClusterId clusterId = (ClusterId) o; return Objects.equals( uuid, clusterId.uuid ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/Endpoint.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/Endpoint.java index d1158a0202702..052fb66f5627a 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/Endpoint.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/Endpoint.java @@ -62,12 +62,15 @@ public static Endpoint route( AdvertisedSocketAddress address ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } Endpoint endPoint = (Endpoint) o; - return Objects.equals( address, endPoint.address ) && - role == endPoint.role; + return Objects.equals( address, endPoint.address ) && role == endPoint.role; } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/LoadBalancingResult.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/LoadBalancingResult.java index 796b6171a9cec..ee05aec367e3a 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/LoadBalancingResult.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/LoadBalancingResult.java @@ -70,9 +70,13 @@ public List readEndpoints() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } LoadBalancingResult that = (LoadBalancingResult) o; return timeToLiveMillis == that.timeToLiveMillis && Objects.equals( routeEndpoints, that.routeEndpoints ) && diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/filters/FilterChain.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/filters/FilterChain.java index 483bb2711b445..7365907ebebd7 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/filters/FilterChain.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/filters/FilterChain.java @@ -49,9 +49,13 @@ public Set apply( Set data ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } FilterChain that = (FilterChain) o; return Objects.equals( chain, that.chain ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/filters/FirstValidRule.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/filters/FirstValidRule.java index 959509741570f..bb77079d6b84d 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/filters/FirstValidRule.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/filters/FirstValidRule.java @@ -55,9 +55,13 @@ public Set apply( Set input ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } FirstValidRule that = (FirstValidRule) o; return Objects.equals( rules, that.rules ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/filters/MinimumCountFilter.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/filters/MinimumCountFilter.java index c1a3749593fbd..c422549c197bd 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/filters/MinimumCountFilter.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/filters/MinimumCountFilter.java @@ -46,9 +46,13 @@ public Set apply( Set data ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } MinimumCountFilter that = (MinimumCountFilter) o; return minCount == that.minCount; } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/AnyGroupFilter.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/AnyGroupFilter.java index 7bcd167ddff5b..942c2fe060908 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/AnyGroupFilter.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/AnyGroupFilter.java @@ -67,9 +67,13 @@ public Set apply( Set data ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } AnyGroupFilter that = (AnyGroupFilter) o; return Objects.equals( groups, that.groups ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/FilteringPolicy.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/FilteringPolicy.java index 20dde34fabf24..d19d244318377 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/FilteringPolicy.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/FilteringPolicy.java @@ -43,9 +43,13 @@ public Set apply( Set data ) public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } FilteringPolicy that = (FilteringPolicy) o; return Objects.equals( filter, that.filter ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/ServerInfo.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/ServerInfo.java index 5a914eb0c75ac..df01c2db65cda 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/ServerInfo.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/ServerInfo.java @@ -60,12 +60,16 @@ Set groups() public boolean equals( Object o ) { if ( this == o ) - { return true; } + { + return true; + } if ( o == null || getClass() != o.getClass() ) - { return false; } + { + return false; + } ServerInfo that = (ServerInfo) o; return Objects.equals( boltAddress, that.boltAddress ) && Objects.equals( memberId, that.memberId ) && - Objects.equals( groups, that.groups ); + Objects.equals( groups, that.groups ); } @Override diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/logging/BetterMessageLogger.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/logging/BetterMessageLogger.java index b4d4d23b8dfce..f7a9c89f3ac36 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/logging/BetterMessageLogger.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/logging/BetterMessageLogger.java @@ -32,7 +32,7 @@ public class BetterMessageLogger extends LifecycleAdapter implements MessageLogger { private final PrintWriter printWriter; - private DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss.SSS"); + private DateFormat dateFormat = new SimpleDateFormat( "HH:mm:ss.SSS" ); public BetterMessageLogger( MEMBER myself, PrintWriter printWriter ) { diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/EndOfStreamException.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/EndOfStreamException.java index 9fec458a4a5ee..38357f37198a7 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/EndOfStreamException.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/EndOfStreamException.java @@ -26,7 +26,7 @@ */ public class EndOfStreamException extends Exception { - public EndOfStreamException(Throwable e) + public EndOfStreamException( Throwable e ) { this.initCause( e ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/storeid/StoreIdMarshal.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/storeid/StoreIdMarshal.java index 7ff936088095b..b9d1cd5bf78a9 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/storeid/StoreIdMarshal.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/storeid/StoreIdMarshal.java @@ -36,7 +36,7 @@ private StoreIdMarshal() {} public void marshal( StoreId storeId, WritableChannel channel ) throws IOException { - if ( storeId == null) + if ( storeId == null ) { channel.put( (byte) 0 ); return; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/ConnectRandomlyWithinServerGroupStrategy.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/ConnectRandomlyWithinServerGroupStrategy.java index 4c91414143603..ab7184ca7003f 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/ConnectRandomlyWithinServerGroupStrategy.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/ConnectRandomlyWithinServerGroupStrategy.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Optional; import java.util.Random; -import java.util.Set; import java.util.stream.Collectors; import org.neo4j.causalclustering.core.CausalClusteringSettings; @@ -32,7 +31,7 @@ import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.helpers.Service; -@Service.Implementation(UpstreamDatabaseSelectionStrategy.class) +@Service.Implementation( UpstreamDatabaseSelectionStrategy.class ) public class ConnectRandomlyWithinServerGroupStrategy extends UpstreamDatabaseSelectionStrategy { private Random random = new Random(); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/VersionDecoderTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/VersionDecoderTest.java index ea16ac0949ec7..f8229c3b3e692 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/VersionDecoderTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/VersionDecoderTest.java @@ -19,12 +19,12 @@ */ package org.neo4j.causalclustering; -import java.util.ArrayList; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.junit.Test; +import java.util.ArrayList; + import org.neo4j.logging.AssertableLogProvider; import static org.neo4j.logging.AssertableLogProvider.inLog; @@ -40,7 +40,7 @@ public void shouldDiscardMessageWithUnknownVersionAndLogAnError() throws Excepti byte currentVersion = (byte) 1; byte messageVersion = (byte) 0; - VersionDecoder versionDecoder = new VersionDecoder(logProvider, currentVersion ); + VersionDecoder versionDecoder = new VersionDecoder( logProvider, currentVersion ); ByteBuf incoming = Unpooled.buffer(); incoming.writeByte( messageVersion ); @@ -59,7 +59,7 @@ public void shouldHandleMessageWithCorrectVersion() throws Exception // given byte currentVersion = (byte) 1; - VersionDecoder versionDecoder = new VersionDecoder(logProvider, currentVersion ); + VersionDecoder versionDecoder = new VersionDecoder( logProvider, currentVersion ); ByteBuf incoming = Unpooled.buffer(); incoming.writeByte( currentVersion ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/backup/ArgsBuilder.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/backup/ArgsBuilder.java index 9dab1a4e30a74..5388779091599 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/backup/ArgsBuilder.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/backup/ArgsBuilder.java @@ -24,38 +24,38 @@ public class ArgsBuilder { - private LinkedList args = new LinkedList<>( ); + private LinkedList args = new LinkedList<>(); public static ArgsBuilder args() { return new ArgsBuilder(); } - public ArgsBuilder homeDir( File homeDir) + public ArgsBuilder homeDir( File homeDir ) { args.add( String.format( "--home-dir=%s", homeDir.getPath() ) ); return this; } - public ArgsBuilder database( String databaseName) + public ArgsBuilder database( String databaseName ) { args.add( String.format( "--database=%s", databaseName ) ); return this; } - public ArgsBuilder seed( String seed) + public ArgsBuilder seed( String seed ) { args.add( String.format( "--cluster-seed=%s", seed ) ); return this; } - public ArgsBuilder config( File config) + public ArgsBuilder config( File config ) { args.add( String.format( "--config=%s", config.getPath() ) ); return this; } - public ArgsBuilder from( File from) + public ArgsBuilder from( File from ) { args.add( String.format( "--from=%s", from.getPath() ) ); return this; diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/TimeoutLoopTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/TimeoutLoopTest.java index e4b347ce3f51b..cfa0671e33479 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/TimeoutLoopTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/TimeoutLoopTest.java @@ -54,7 +54,7 @@ public void shouldReturnImmediatelyIfFutureIsAlreadyComplete() throws Exception assertEquals( 12L, value ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) @Test public void shouldTimeoutIfNoActivity() throws Exception { @@ -78,7 +78,7 @@ public void shouldTimeoutIfNoActivity() throws Exception } } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) @Test public void shouldTimeoutIfNoContinuedActivity() throws Exception { @@ -102,7 +102,7 @@ public void shouldTimeoutIfNoContinuedActivity() throws Exception } } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) @Test public void shouldKeepWaitingIfThereIsSomeActivity() throws Exception { diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/RemoteStoreTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/RemoteStoreTest.java index b81b76d8bc7f3..a9f3a007802c5 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/RemoteStoreTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/RemoteStoreTest.java @@ -57,7 +57,8 @@ public void shouldCopyStoreFilesAndPullTransactions() throws Exception StoreId storeId = new StoreId( 1, 2, 3, 4 ); StoreCopyClient storeCopyClient = mock( StoreCopyClient.class ); TxPullClient txPullClient = mock( TxPullClient.class ); - when( txPullClient.pullTransactions( any(), any(), anyLong(), any() ) ).thenReturn( new TxPullRequestResult( SUCCESS_END_OF_STREAM, 13) ); + when( txPullClient.pullTransactions( any(), any(), anyLong(), any() ) ) + .thenReturn( new TxPullRequestResult( SUCCESS_END_OF_STREAM, 13 ) ); TransactionLogCatchUpWriter writer = mock( TransactionLogCatchUpWriter.class ); RemoteStore remoteStore = new RemoteStore( NullLogProvider.getInstance(), mock( FileSystemAbstraction.class ), @@ -86,7 +87,7 @@ public void shouldSetLastPulledTransactionId() throws Exception TxPullClient txPullClient = mock( TxPullClient.class ); when( txPullClient.pullTransactions( eq( localhost ), eq( wantedStoreId ), anyLong(), any( TxPullResponseListener.class ) ) ) - .thenReturn( new TxPullRequestResult( SUCCESS_END_OF_STREAM, 13) ); + .thenReturn( new TxPullRequestResult( SUCCESS_END_OF_STREAM, 13 ) ); TransactionLogCatchUpWriter writer = mock( TransactionLogCatchUpWriter.class ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/CatchupPollingProcessTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/CatchupPollingProcessTest.java index 22dfaa002c088..b3c3ca01fad74 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/CatchupPollingProcessTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/CatchupPollingProcessTest.java @@ -209,9 +209,9 @@ public void shouldNotSignalOperationalUntilPulling() throws Throwable when( catchUpClient.makeBlockingRequest( any( MemberId.class ), any( TxPullRequest.class ), any( CatchUpResponseCallback.class ) ) ) .thenReturn( - new TxStreamFinishedResponse( CatchupResult.E_TRANSACTION_PRUNED, 0), - new TxStreamFinishedResponse( CatchupResult.SUCCESS_END_OF_BATCH, 10), - new TxStreamFinishedResponse( CatchupResult.SUCCESS_END_OF_STREAM, 15) ); + new TxStreamFinishedResponse( CatchupResult.E_TRANSACTION_PRUNED, 0 ), + new TxStreamFinishedResponse( CatchupResult.SUCCESS_END_OF_BATCH, 10 ), + new TxStreamFinishedResponse( CatchupResult.SUCCESS_END_OF_STREAM, 15 ) ); // when txPuller.start(); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/RaftMachineTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/RaftMachineTest.java index f97fb3ebe5e9f..69d4107902bf4 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/RaftMachineTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/RaftMachineTest.java @@ -390,12 +390,11 @@ public void shouldPersistAtSpecifiedLogIndex() throws Exception .raftLog( raftLog ) .build(); - raftLog.append( new RaftLogEntry(0, new MemberIdSet(asSet( myself, member1, member2 ))) ); + raftLog.append( new RaftLogEntry( 0, new MemberIdSet( asSet( myself, member1, member2 ) ) ) ); // when - raft.handle( - appendEntriesRequest().from( member1 ).prevLogIndex( 0 ).prevLogTerm( 0 ).leaderTerm( 0 ) - .logEntry( new RaftLogEntry( 0, data1 ) ).build()); + raft.handle( appendEntriesRequest().from( member1 ).prevLogIndex( 0 ).prevLogTerm( 0 ).leaderTerm( 0 ) + .logEntry( new RaftLogEntry( 0, data1 ) ).build()); // then assertEquals( 1, raftLog.appendIndex() ); assertEquals( data1, readLogEntry( raftLog, 1 ).content() ); @@ -483,14 +482,11 @@ public void shouldNotCacheInFlightEntriesUntilAfterRecovery() throws Exception FakeClock fakeClock = Clocks.fakeClock(); InFlightMap inFlightMap = new InFlightMap<>(); ControlledRenewableTimeoutService timeouts = new ControlledRenewableTimeoutService( fakeClock ); - RaftMachine raft = new RaftMachineBuilder( myself, 3, RaftTestMemberSetBuilder.INSTANCE ) - .timeoutService( timeouts ) - .clock( fakeClock ) - .raftLog( raftLog ) - .inFlightMap( inFlightMap ) - .build(); + RaftMachine raft = + new RaftMachineBuilder( myself, 3, RaftTestMemberSetBuilder.INSTANCE ).timeoutService( timeouts ) + .clock( fakeClock ).raftLog( raftLog ).inFlightMap( inFlightMap ).build(); - raftLog.append( new RaftLogEntry(0, new MemberIdSet(asSet( myself, member1, member2 ))) ); + raftLog.append( new RaftLogEntry( 0, new MemberIdSet( asSet( myself, member1, member2 ) ) ) ); // when raft.handle( appendEntriesRequest().from( member1 ).prevLogIndex( 0 ).prevLogTerm( 0 ).leaderTerm( 0 ) diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/RaftTestFixture.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/RaftTestFixture.java index 23d3056ddbf30..d99898b3e9c76 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/RaftTestFixture.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/RaftTestFixture.java @@ -44,7 +44,6 @@ import org.neo4j.time.FakeClock; import static java.lang.String.format; - import static org.neo4j.helpers.collection.Iterators.asSet; public class RaftTestFixture @@ -89,8 +88,8 @@ public void bootstrap( MemberId[] members ) throws RaftMachine.BootstrapExceptio { for ( MemberFixture member : members() ) { - member.raftLog().append( new RaftLogEntry(0, new MemberIdSet(asSet( members ))) ); - member.raftInstance().installCoreState( new RaftCoreState( new MembershipEntry( 0, asSet( members )) ) ); + member.raftLog().append( new RaftLogEntry( 0, new MemberIdSet( asSet( members ) ) ) ); + member.raftInstance().installCoreState( new RaftCoreState( new MembershipEntry( 0, asSet( members ) ) ) ); member.raftInstance().postRecoveryActions(); } } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/election/Fixture.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/election/Fixture.java index 513b2ecfed283..376bb2fa64e35 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/election/Fixture.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/election/Fixture.java @@ -83,7 +83,7 @@ public class Fixture .commitListener( waiter ) .build(); - rafts.add( new RaftFixture(raftMachine, raftLog) ); + rafts.add( new RaftFixture( raftMachine, raftLog ) ); } } @@ -104,8 +104,8 @@ void boot() throws BootstrapException, TimeoutException, InterruptedException, I { for ( RaftFixture raft : rafts ) { - raft.raftLog().append( new RaftLogEntry(0, new MemberIdSet(asSet( members ))) ); - raft.raftMachine().installCoreState( new RaftCoreState( new MembershipEntry( 0, members ) ) ); + raft.raftLog().append( new RaftLogEntry( 0, new MemberIdSet( asSet( members ) ) ) ); + raft.raftMachine().installCoreState( new RaftCoreState( new MembershipEntry( 0, members ) ) ); raft.raftMachine.postRecoveryActions(); } net.start(); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/RaftLogHelper.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/RaftLogHelper.java index 45300bd4a7ad5..aa4eb19d97325 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/RaftLogHelper.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/RaftLogHelper.java @@ -38,7 +38,7 @@ public static RaftLogEntry readLogEntry( ReadableRaftLog raftLog, long index ) t } //todo: do not do this and update RaftLogContractTest to not depend on this exception. - throw new IOException("Asked for raft log entry at index " + index + " but it was not found"); + throw new IOException( "Asked for raft log entry at index " + index + " but it was not found" ); } public static Matcher hasNoContent( long index ) diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/RaftMachineLogTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/RaftMachineLogTest.java index 79d499671c463..f2c26b782f642 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/RaftMachineLogTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/RaftMachineLogTest.java @@ -39,7 +39,7 @@ import static org.neo4j.causalclustering.core.consensus.log.RaftLogHelper.readLogEntry; import static org.neo4j.causalclustering.identity.RaftTestMember.member; -@RunWith(MockitoJUnitRunner.class) +@RunWith( MockitoJUnitRunner.class ) public class RaftMachineLogTest { @Mock diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/segmented/FileNamesTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/segmented/FileNamesTest.java index 1f24cb857031b..97253f865cb4e 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/segmented/FileNamesTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/segmented/FileNamesTest.java @@ -19,12 +19,7 @@ */ package org.neo4j.causalclustering.core.consensus.log.segmented; -import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import org.junit.Test; import java.io.File; import java.util.LinkedList; @@ -32,10 +27,16 @@ import java.util.Map; import java.util.SortedMap; -import org.junit.Test; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.logging.Log; +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class FileNamesTest { @Test @@ -105,19 +106,19 @@ public void shouldIgnoreUnexpectedLogDirectoryContents() throws Exception filesPresent.add( fileNames.getForVersion( 1 ) ); // should be included filesPresent.add( fileNames.getForVersion( 10 ) ); // should be included filesPresent.add( fileNames.getForVersion( 11 ) ); // should be included - filesPresent.add( new File(base, FileNames.BASE_FILE_NAME + "01" ) ); // should be ignored - filesPresent.add( new File(base, FileNames.BASE_FILE_NAME + "001" ) ); // should be ignored - filesPresent.add( new File(base, FileNames.BASE_FILE_NAME ) ); // should be ignored - filesPresent.add( new File(base, FileNames.BASE_FILE_NAME + "-1" ) ); // should be ignored - filesPresent.add( new File(base, FileNames.BASE_FILE_NAME + "1a" ) ); // should be ignored - filesPresent.add( new File(base, FileNames.BASE_FILE_NAME + "a1" ) ); // should be ignored - filesPresent.add( new File(base, FileNames.BASE_FILE_NAME + "ab" ) ); // should be ignored + filesPresent.add( new File( base, FileNames.BASE_FILE_NAME + "01" ) ); // should be ignored + filesPresent.add( new File( base, FileNames.BASE_FILE_NAME + "001" ) ); // should be ignored + filesPresent.add( new File( base, FileNames.BASE_FILE_NAME ) ); // should be ignored + filesPresent.add( new File( base, FileNames.BASE_FILE_NAME + "-1" ) ); // should be ignored + filesPresent.add( new File( base, FileNames.BASE_FILE_NAME + "1a" ) ); // should be ignored + filesPresent.add( new File( base, FileNames.BASE_FILE_NAME + "a1" ) ); // should be ignored + filesPresent.add( new File( base, FileNames.BASE_FILE_NAME + "ab" ) ); // should be ignored when( fsa.listFiles( base ) ).thenReturn( filesPresent.toArray( new File[]{} ) ); // When // asked for the contents of the directory - SortedMap allFiles = fileNames.getAllFiles( fsa, log ); + SortedMap allFiles = fileNames.getAllFiles( fsa, log ); // Then // only valid things should be returned diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/segmented/SegmentsTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/segmented/SegmentsTest.java index d428cef6a8937..0852fad1f1c6f 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/segmented/SegmentsTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/segmented/SegmentsTest.java @@ -190,7 +190,7 @@ public void shouldNotSwallowExceptionOnClose() throws Exception segments.close(); fail( "should have thrown" ); } - catch ( RuntimeException ex) + catch ( RuntimeException ex ) { // Then Throwable[] suppressed = ex.getSuppressed(); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/membership/RaftGroupMembershipTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/membership/RaftGroupMembershipTest.java index e10c7a8cf8f2e..5036112f5721b 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/membership/RaftGroupMembershipTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/membership/RaftGroupMembershipTest.java @@ -27,12 +27,12 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.neo4j.causalclustering.messaging.Message; import org.neo4j.causalclustering.core.consensus.DirectNetworking; import org.neo4j.causalclustering.core.consensus.RaftTestFixture; +import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.causalclustering.messaging.Inbound; +import org.neo4j.causalclustering.messaging.Message; import org.neo4j.causalclustering.messaging.Outbound; -import org.neo4j.causalclustering.identity.MemberId; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -44,7 +44,7 @@ import static org.neo4j.causalclustering.core.consensus.roles.Role.LEADER; import static org.neo4j.causalclustering.identity.RaftTestMember.member; -@RunWith(MockitoJUnitRunner.class) +@RunWith( MockitoJUnitRunner.class ) public class RaftGroupMembershipTest { @Mock diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/AppendEntriesMessageFlowTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/AppendEntriesMessageFlowTest.java index 982732bc5bd1b..6e57bbef0b954 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/AppendEntriesMessageFlowTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/AppendEntriesMessageFlowTest.java @@ -36,9 +36,9 @@ import org.neo4j.causalclustering.core.consensus.log.RaftLog; import org.neo4j.causalclustering.core.consensus.log.RaftLogEntry; import org.neo4j.causalclustering.core.consensus.membership.RaftTestGroup; -import org.neo4j.causalclustering.messaging.Outbound; import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.causalclustering.identity.RaftTestMemberSetBuilder; +import org.neo4j.causalclustering.messaging.Outbound; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.same; @@ -49,7 +49,7 @@ import static org.neo4j.causalclustering.core.consensus.TestMessageBuilders.appendEntriesResponse; import static org.neo4j.causalclustering.identity.RaftTestMember.member; -@RunWith(MockitoJUnitRunner.class) +@RunWith( MockitoJUnitRunner.class ) public class AppendEntriesMessageFlowTest { private MemberId myself = member( 0 ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/AppendEntriesRequestTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/AppendEntriesRequestTest.java index f629d35edc8d6..6378c16374004 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/AppendEntriesRequestTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/AppendEntriesRequestTest.java @@ -53,11 +53,11 @@ import static org.neo4j.causalclustering.core.consensus.state.RaftStateBuilder.raftState; import static org.neo4j.causalclustering.identity.RaftTestMember.member; -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class AppendEntriesRequestTest { - @Parameterized.Parameters(name = "{0} with leader {1} terms ahead.") + @Parameterized.Parameters( name = "{0} with leader {1} terms ahead." ) public static Collection data() { return Arrays.asList( new Object[][]{ @@ -65,10 +65,10 @@ public static Collection data() } ); } - @Parameterized.Parameter(value = 0) + @Parameterized.Parameter( value = 0 ) public Role role; - @Parameterized.Parameter(value = 1) + @Parameterized.Parameter( value = 1 ) public int leaderTermDifference; private MemberId myself = member( 0 ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/CandidateTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/CandidateTest.java index e332efa160952..c792674bdbf7e 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/CandidateTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/CandidateTest.java @@ -48,7 +48,7 @@ import static org.neo4j.causalclustering.core.consensus.state.RaftStateBuilder.raftState; import static org.neo4j.causalclustering.identity.RaftTestMember.member; -@RunWith(MockitoJUnitRunner.class) +@RunWith( MockitoJUnitRunner.class ) public class CandidateTest { private MemberId myself = member( 0 ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/ElectionTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/ElectionTest.java index 43597e7e845a2..10f7432884988 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/ElectionTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/ElectionTest.java @@ -43,7 +43,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; - import static org.neo4j.causalclustering.core.consensus.TestMessageBuilders.voteRequest; import static org.neo4j.causalclustering.core.consensus.TestMessageBuilders.voteResponse; import static org.neo4j.causalclustering.core.consensus.roles.Role.CANDIDATE; @@ -52,7 +51,7 @@ import static org.neo4j.helpers.collection.Iterators.asSet; -@RunWith(MockitoJUnitRunner.class) +@RunWith( MockitoJUnitRunner.class ) public class ElectionTest { private MemberId myself = member( 0 ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/FollowerTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/FollowerTest.java index 2ef13709bc537..f1d4d3d1e3a01 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/FollowerTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/FollowerTest.java @@ -55,7 +55,7 @@ import static org.neo4j.causalclustering.identity.RaftTestMember.member; import static org.neo4j.helpers.collection.Iterators.asSet; -@RunWith(MockitoJUnitRunner.class) +@RunWith( MockitoJUnitRunner.class ) public class FollowerTest { private MemberId myself = member( 0 ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/HeartbeatTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/HeartbeatTest.java index 7166c74f6aa29..026fb950c01e2 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/HeartbeatTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/HeartbeatTest.java @@ -43,10 +43,10 @@ import static org.neo4j.causalclustering.core.consensus.state.RaftStateBuilder.raftState; import static org.neo4j.causalclustering.identity.RaftTestMember.member; -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class HeartbeatTest { - @Parameterized.Parameters(name = "{0} with leader {1} terms ahead.") + @Parameterized.Parameters( name = "{0} with leader {1} terms ahead." ) public static Collection data() { return Arrays.asList( new Object[][]{ @@ -54,10 +54,10 @@ public static Collection data() } ); } - @Parameterized.Parameter(value = 0) + @Parameterized.Parameter( value = 0 ) public Role role; - @Parameterized.Parameter(value = 1) + @Parameterized.Parameter( value = 1 ) public int leaderTermDifference; private MemberId myself = member( 0 ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/NonFollowerVoteRequestTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/NonFollowerVoteRequestTest.java index ae14c7e6881d0..94e3705b41881 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/NonFollowerVoteRequestTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/NonFollowerVoteRequestTest.java @@ -41,10 +41,10 @@ import static org.neo4j.causalclustering.core.consensus.state.RaftStateBuilder.raftState; import static org.neo4j.causalclustering.identity.RaftTestMember.member; -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class NonFollowerVoteRequestTest { - @Parameterized.Parameters(name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static Collection data() { return asList( Role.CANDIDATE, Role.LEADER ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/VoteRequestTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/VoteRequestTest.java index 1ff5b04e476fb..f9587568ea83c 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/VoteRequestTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/roles/VoteRequestTest.java @@ -45,10 +45,10 @@ /** * Most behaviour for handling vote requests is identical for all roles. */ -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class VoteRequestTest { - @Parameterized.Parameters(name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static Collection data() { return asList( Role.values() ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/vote/VotingTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/vote/VotingTest.java index c67439220d71f..3251c3cf71bef 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/vote/VotingTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/vote/VotingTest.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -@RunWith(MockitoJUnitRunner.class) +@RunWith( MockitoJUnitRunner.class ) public class VotingTest { MemberId candidate = new MemberId( UUID.randomUUID() ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/server/BatchingMessageHandlerTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/server/BatchingMessageHandlerTest.java index 590eee625e33d..c25f6df18ca7d 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/server/BatchingMessageHandlerTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/server/BatchingMessageHandlerTest.java @@ -19,14 +19,13 @@ */ package org.neo4j.causalclustering.core.server; +import org.junit.Test; + import java.util.UUID; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.function.Supplier; - -import org.junit.Test; import org.neo4j.causalclustering.core.consensus.RaftMessages; import org.neo4j.causalclustering.core.consensus.ReplicatedString; @@ -176,7 +175,7 @@ public void shouldDropMessagesAfterBeingStopped() throws Exception .debug( "This handler has been stopped, dropping the message: %s", message ) ); } - @Test( timeout = 5_000 /* 5 seconds */) + @Test( timeout = 5_000 ) public void shouldGiveUpAddingMessagesInTheQueueIfTheHandlerHasBeenStopped() throws Exception { // given diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/InFlightLogEntryReaderTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/InFlightLogEntryReaderTest.java index 16404036cfb72..faf6cc36d0cb0 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/InFlightLogEntryReaderTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/InFlightLogEntryReaderTest.java @@ -117,7 +117,7 @@ public void shouldNeverUseMapAgainAfterHavingFeltBackToTheRaftLog() throws Excep // then assertEquals( entries[offset], raftLogEntry ); - if ( offset <= 1) + if ( offset <= 1 ) { verify( inFlightMap ).get( offset + logIndex ); } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/locks/LeaderOnlyLockManagerTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/locks/LeaderOnlyLockManagerTest.java index b36afa7315a48..5b0e46652450a 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/locks/LeaderOnlyLockManagerTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/locks/LeaderOnlyLockManagerTest.java @@ -35,7 +35,7 @@ import static org.mockito.Mockito.when; import static org.neo4j.causalclustering.identity.RaftTestMember.member; -@SuppressWarnings("unchecked") +@SuppressWarnings( "unchecked" ) public class LeaderOnlyLockManagerTest { @Test diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionCommitProcessTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionCommitProcessTest.java index 448a95a07e01a..65b4ff3b422d6 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionCommitProcessTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionCommitProcessTest.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@SuppressWarnings("unchecked") +@SuppressWarnings( "unchecked" ) public class ReplicatedTransactionCommitProcessTest { private Replicator replicator = mock( Replicator.class ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryServiceIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryServiceIT.java index 516f7acb1eb4e..4def0963463ff 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryServiceIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryServiceIT.java @@ -58,7 +58,7 @@ public class SharedDiscoveryServiceIT private NullLogProvider logProvider = NullLogProvider.getInstance(); private NullLogProvider userLogProvider = NullLogProvider.getInstance(); - @Test(timeout = TIMEOUT_MS) + @Test( timeout = TIMEOUT_MS ) public void shouldDiscoverCompleteTargetSetWithoutDeadlocks() throws Exception { // given diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1Test.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1Test.java index f550ae0b55641..16783f544340e 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1Test.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1Test.java @@ -83,7 +83,7 @@ public class GetServersProcedureV1Test @Parameterized.Parameter( 2 ) public boolean expectFollowersAsReadEndPoints; - @Parameterized.Parameters( name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static Collection params() { return Arrays.asList( diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/RaftMessageProcessingTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/RaftMessageProcessingTest.java index c702366eb2b9c..a35c63eb00391 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/RaftMessageProcessingTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/RaftMessageProcessingTest.java @@ -43,7 +43,7 @@ import static org.junit.Assert.assertEquals; -@RunWith(MockitoJUnitRunner.class) +@RunWith( MockitoJUnitRunner.class ) public class RaftMessageProcessingTest { private static ChannelMarshal serializer = new SafeChannelMarshal() diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterBindingIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterBindingIT.java index cca4350cc873a..64883980b2583 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterBindingIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterBindingIT.java @@ -77,7 +77,7 @@ public void setup() throws Exception { fs = fileSystemRule.get(); cluster = clusterRule.startCluster(); - cluster.coreTx( (db,tx) -> + cluster.coreTx( ( db, tx ) -> { SampleData.createSchema( db ); tx.success(); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterDiscoveryIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterDiscoveryIT.java index 8f4be27e26180..ea66141420ca8 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterDiscoveryIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterDiscoveryIT.java @@ -61,7 +61,7 @@ public class ClusterDiscoveryIT @Parameterized.Parameter( 2 ) public boolean expectFollowersAsReadEndPoints; - @Parameterized.Parameters( name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static Collection params() { return Arrays.asList( diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterOverviewIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterOverviewIT.java index f43b190f70c5c..13721de5a79fa 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterOverviewIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterOverviewIT.java @@ -19,15 +19,6 @@ */ package org.neo4j.causalclustering.scenarios; -import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Stream; - import org.hamcrest.Description; import org.hamcrest.FeatureMatcher; import org.hamcrest.Matcher; @@ -37,7 +28,15 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.neo4j.collection.RawIterator; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Stream; + import org.neo4j.causalclustering.core.CausalClusteringSettings; import org.neo4j.causalclustering.discovery.Cluster; import org.neo4j.causalclustering.discovery.ClusterMember; @@ -45,6 +44,7 @@ import org.neo4j.causalclustering.discovery.SharedDiscoveryService; import org.neo4j.causalclustering.discovery.procedures.ClusterOverviewProcedure; import org.neo4j.causalclustering.discovery.procedures.Role; +import org.neo4j.collection.RawIterator; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.KernelTransaction.Type; @@ -57,11 +57,9 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.toList; - import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; - import static org.neo4j.causalclustering.discovery.procedures.Role.FOLLOWER; import static org.neo4j.causalclustering.discovery.procedures.Role.LEADER; import static org.neo4j.causalclustering.discovery.procedures.Role.READ_REPLICA; @@ -293,7 +291,7 @@ protected boolean matchesSafely( MemberInfo item ) Set addresses = asSet(item.addresses); for ( URI uri : coreClusterMember.clientConnectorAddresses().uriList() ) { - if (!addresses.contains( uri.toString() )) + if ( !addresses.contains( uri.toString() ) ) { return false; } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ConvertNonCausalClusteringStoreIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ConvertNonCausalClusteringStoreIT.java index 52fac9758f806..c944c2b198815 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ConvertNonCausalClusteringStoreIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ConvertNonCausalClusteringStoreIT.java @@ -50,7 +50,7 @@ import static org.neo4j.helpers.collection.Iterables.count; import static org.neo4j.test.assertion.Assert.assertEventually; -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class ConvertNonCausalClusteringStoreIT { @Rule @@ -61,7 +61,7 @@ public class ConvertNonCausalClusteringStoreIT @Parameterized.Parameter() public String recordFormat; - @Parameterized.Parameters(name = "Record format {0}") + @Parameterized.Parameters( name = "Record format {0}" ) public static Collection data() { return Arrays.asList( new Object[]{Standard.LATEST_NAME, HighLimit.NAME} ); @@ -88,7 +88,7 @@ public void shouldReplicateTransactionToCoreMembers() throws Throwable cluster.start(); // when - cluster.coreTx( (coreDB, tx) -> + cluster.coreTx( ( coreDB, tx ) -> { Node node = coreDB.createNode( label( "boo" ) ); node.setProperty( "foobar", "baz_bat" ); @@ -104,7 +104,7 @@ public void shouldReplicateTransactionToCoreMembers() throws Throwable try ( Transaction tx = db.beginTx() ) { - ThrowingSupplier nodeCount = () -> count( db.getAllNodes() ); + ThrowingSupplier nodeCount = () -> count( db.getAllNodes() ); Config config = db.getDependencyResolver().resolveDependency( Config.class ); @@ -120,7 +120,7 @@ public void shouldReplicateTransactionToCoreMembers() throws Throwable private File createNeoStore( File dbDir, int classicNodeCount ) throws IOException { - try (DefaultFileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction()) + try ( DefaultFileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction() ) { return createClassicNeo4jStore( dbDir, fileSystem, classicNodeCount, recordFormat ); } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ReadReplicaReplicationIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ReadReplicaReplicationIT.java index 89e3d0e5839a5..f7af8e2d36862 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ReadReplicaReplicationIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ReadReplicaReplicationIT.java @@ -413,7 +413,7 @@ public void shouldBeAbleToPullTxAfterHavingDownloadedANewStoreAfterPruning() thr awaitEx( () -> readReplicasUpToDateAsTheLeader( cluster.awaitLeader(), cluster.readReplicas() ), 1, TimeUnit.MINUTES ); // when - cluster.coreTx( (db, tx) -> + cluster.coreTx( ( db, tx ) -> { createData( db, 10 ); tx.success(); diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/ClusterMonitor.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/ClusterMonitor.java index f57fe6e8e8f89..4576021b15eb3 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/ClusterMonitor.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/ClusterMonitor.java @@ -36,7 +36,7 @@ */ public interface ClusterMonitor extends BindingNotifier, Heartbeat { - void addClusterListener( ClusterListener listener); + void addClusterListener( ClusterListener listener ); - void removeClusterListener( ClusterListener listener); + void removeClusterListener( ClusterListener listener ); } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/ExecutorLifecycleAdapter.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/ExecutorLifecycleAdapter.java index 66824ed4d1da9..f1d602924766e 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/ExecutorLifecycleAdapter.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/ExecutorLifecycleAdapter.java @@ -53,7 +53,7 @@ public void start() throws Throwable @Override public void stop() throws Throwable { - if (executor != null) + if ( executor != null ) { executor.shutdown(); executor.awaitTermination( 30, TimeUnit.SECONDS ); diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/NetworkedServerFactory.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/NetworkedServerFactory.java index f32ff6393e154..6ec91a7673387 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/NetworkedServerFactory.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/NetworkedServerFactory.java @@ -62,7 +62,7 @@ public NetworkedServerFactory( LifeSupport life, ProtocolServerFactory protocolS ObjectOutputStreamFactory objectOutputStreamFactory, NetworkReceiver.Monitor networkReceiverMonitor, NetworkSender.Monitor networkSenderMonitor, - NamedThreadFactory.Monitor namedThreadFactoryMonitor) + NamedThreadFactory.Monitor namedThreadFactoryMonitor ) { this.life = life; this.protocolServerFactory = protocolServerFactory; @@ -100,8 +100,7 @@ public String name() } }, logProvider ); - final NetworkSender sender = new NetworkSender(networkSenderMonitor, - new NetworkSender.Configuration() + final NetworkSender sender = new NetworkSender( networkSenderMonitor, new NetworkSender.Configuration() { @Override public int defaultPort() @@ -134,8 +133,8 @@ public void listeningAt( URI me ) protocolServer.listeningAt( me ); if ( logger == null ) { - logger = new StateTransitionLogger( logProvider, - new AtomicBroadcastSerializer(objectInputStreamFactory, objectOutputStreamFactory)); + logger = new StateTransitionLogger( logProvider, + new AtomicBroadcastSerializer( objectInputStreamFactory, objectOutputStreamFactory ) ); protocolServer.addStateTransitionListener( logger ); } } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/ProtocolServer.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/ProtocolServer.java index 48ddd912a6579..2f9a60513ad92 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/ProtocolServer.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/ProtocolServer.java @@ -53,7 +53,7 @@ public ProtocolServer( InstanceId me, StateMachines stateMachines, LogProvider l this.stateMachines = stateMachines; this.msgLog = logProvider.getLog( getClass() ); - StateMachineConversations conversations = new StateMachineConversations(me); + StateMachineConversations conversations = new StateMachineConversations( me ); proxyFactory = new StateMachineProxyFactory( stateMachines, conversations, me, logProvider ); stateMachines.addMessageProcessor( proxyFactory ); } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/client/ClusterClientModule.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/client/ClusterClientModule.java index 0d5ae4afa2841..7548eb906b7d3 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/client/ClusterClientModule.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/client/ClusterClientModule.java @@ -188,7 +188,7 @@ public int port() life.add( receiver ); // Timeout timer - triggers every 10 ms - life.add( new TimeoutTrigger(server, monitors) ); + life.add( new TimeoutTrigger( server, monitors ) ); life.add( new ClusterJoin( new ClusterJoin.Configuration() { diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/com/NetworkReceiver.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/com/NetworkReceiver.java index d8c8b54662cc7..b0166c769f6d4 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/com/NetworkReceiver.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/com/NetworkReceiver.java @@ -168,7 +168,7 @@ public void shutdown() { } - public void setPaused(boolean paused) + public void setPaused( boolean paused ) { this.paused = paused; } @@ -183,7 +183,7 @@ private int listen( int minPort, int maxPort ) { String address = config.clusterServer().getHost(); InetSocketAddress localAddress; - if ( address == null || address.equals( INADDR_ANY )) + if ( address == null || address.equals( INADDR_ANY ) ) { localAddress = new InetSocketAddress( checkPort ); } @@ -219,7 +219,7 @@ public void addMessageProcessor( MessageProcessor processor ) public void receive( Message message ) { - if (!paused) + if ( !paused ) { for ( MessageProcessor processor : processors ) { @@ -318,9 +318,9 @@ public void channelOpen( ChannelHandlerContext ctx, ChannelStateEvent e ) throws @Override public void messageReceived( ChannelHandlerContext ctx, MessageEvent event ) throws Exception { - if (!bindingDetected) + if ( !bindingDetected ) { - InetSocketAddress local = (InetSocketAddress)event.getChannel().getLocalAddress(); + InetSocketAddress local = (InetSocketAddress) event.getChannel().getLocalAddress(); bindingDetected = true; listeningAt( getURI( local ) ); } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/com/NetworkSender.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/com/NetworkSender.java index ce47346e56ee6..a6964a29387aa 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/com/NetworkSender.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/com/NetworkSender.java @@ -232,7 +232,7 @@ public void process( final List> messages ) @Override public boolean process( Message message ) { - if (!paused) + if ( !paused ) { if ( message.hasHeader( Message.TO ) ) { @@ -247,7 +247,7 @@ public boolean process( Message message ) return true; } - public void setPaused(boolean paused) + public void setPaused( boolean paused ) { this.paused = paused; } @@ -458,7 +458,7 @@ public void exceptionCaught( ChannelHandlerContext ctx, ExceptionEvent e ) throw if ( !(cause instanceof ConnectException || cause instanceof RejectedExecutionException) ) { // If we keep getting the same exception, only output the first one - if (lastException != null && !lastException.getClass().equals( cause.getClass() )) + if ( lastException != null && !lastException.getClass().equals( cause.getClass() ) ) { msgLog.error( "Receive exception:", cause ); lastException = cause; @@ -469,9 +469,9 @@ public void exceptionCaught( ChannelHandlerContext ctx, ExceptionEvent e ) throw @Override public void writeComplete( ChannelHandlerContext ctx, WriteCompletionEvent e ) throws Exception { - if (lastException != null) + if ( lastException != null ) { - msgLog.error( "Recovered from:", lastException); + msgLog.error( "Recovered from:", lastException ); lastException = null; } super.writeComplete( ctx, e ); diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/member/paxos/PaxosClusterMemberEvents.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/member/paxos/PaxosClusterMemberEvents.java index 711103a522fe9..494ebef3e4c15 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/member/paxos/PaxosClusterMemberEvents.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/member/paxos/PaxosClusterMemberEvents.java @@ -134,7 +134,8 @@ public void init() heartbeat.addHeartbeatListener( heartbeatListener = new HeartbeatListenerImpl() ); - executor = Executors.newSingleThreadExecutor(new NamedThreadFactory("Paxos event notification", namedThreadFactoryMonitor)); + executor = Executors.newSingleThreadExecutor( + new NamedThreadFactory( "Paxos event notification", namedThreadFactoryMonitor ) ); } @Override diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/ConfigurationContext.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/ConfigurationContext.java index 0d98fc1ee3146..e8881dbef6225 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/ConfigurationContext.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/ConfigurationContext.java @@ -39,7 +39,7 @@ public interface ConfigurationContext URI getUriForId( InstanceId id ); - InstanceId getIdForUri(URI uri); + InstanceId getIdForUri( URI uri ); boolean isMe( InstanceId server ); } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/AcceptorInstanceStore.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/AcceptorInstanceStore.java index 1056eefc96133..33ad42de56840 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/AcceptorInstanceStore.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/AcceptorInstanceStore.java @@ -30,7 +30,7 @@ public interface AcceptorInstanceStore void accept( AcceptorInstance instance, Object value ); - void lastDelivered(InstanceId instanceId); + void lastDelivered( InstanceId instanceId ); void clear(); } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/AcceptorMessage.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/AcceptorMessage.java index ea8f7603d45b6..72e06d8c07507 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/AcceptorMessage.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/AcceptorMessage.java @@ -153,7 +153,7 @@ public int hashCode() public String toString() { Object toStringValue = value; - if (toStringValue instanceof Payload ) + if ( toStringValue instanceof Payload ) { try { diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/InMemoryAcceptorInstanceStore.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/InMemoryAcceptorInstanceStore.java index 1bfeeb9feb376..76b727381e7bf 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/InMemoryAcceptorInstanceStore.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/InMemoryAcceptorInstanceStore.java @@ -37,11 +37,11 @@ public class InMemoryAcceptorInstanceStore public InMemoryAcceptorInstanceStore() { - this(new HashMap(), new ArrayBlockingQueue( 1000 ), -1); + this( new HashMap<>(), new ArrayBlockingQueue<>( 1000 ), -1 ); } - private InMemoryAcceptorInstanceStore(Map instances, - BlockingQueue currentInstances, long lastDeliveredInstanceId) + private InMemoryAcceptorInstanceStore( Map instances, + BlockingQueue currentInstances, long lastDeliveredInstanceId ) { this.instances = instances; this.lastDeliveredInstanceId = lastDeliveredInstanceId; @@ -58,7 +58,7 @@ public AcceptorInstance getAcceptorInstance( InstanceId instanceId ) instances.put( instanceId, instance ); // Make sure we only keep a maximum number of instances, to not run out of memory - if (!currentInstances.offer( instanceId )) + if ( !currentInstances.offer( instanceId ) ) { instances.remove( currentInstances.poll() ); currentInstances.offer( instanceId ); @@ -94,10 +94,9 @@ public void clear() public InMemoryAcceptorInstanceStore snapshot() { - return new InMemoryAcceptorInstanceStore( new HashMap<>(instances), + return new InMemoryAcceptorInstanceStore( new HashMap<>( instances ), new ArrayBlockingQueue<>( currentInstances.size() + currentInstances.remainingCapacity(), false, - currentInstances ), - lastDeliveredInstanceId ); + currentInstances ), lastDeliveredInstanceId ); } @Override diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/LearnerMessage.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/LearnerMessage.java index 78e203fb0870c..2c0e5a8417484 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/LearnerMessage.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/LearnerMessage.java @@ -55,12 +55,13 @@ public Object getValue() @Override public String toString() { - if (value instanceof Payload ) + if ( value instanceof Payload ) { try { ObjectStreamFactory streamFactory = new ObjectStreamFactory(); - return new AtomicBroadcastSerializer( streamFactory, streamFactory ).receive( (Payload) value).toString(); + return new AtomicBroadcastSerializer( streamFactory, streamFactory ).receive( (Payload) value ) + .toString(); } catch ( Throwable e ) { @@ -111,7 +112,7 @@ public LearnRequestState() @Override public boolean equals( Object obj ) { - if (obj == null) + if ( obj == null ) { return false; } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/LearnerState.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/LearnerState.java index 422a824de2285..919a1a6c0356f 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/LearnerState.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/LearnerState.java @@ -283,7 +283,7 @@ private URI lastKnownAliveUriOrSenderUri( LearnerContext context, Message getAcceptors() return acceptors; } - public PaxosInstance snapshot(PaxosInstanceStore store) + public PaxosInstance snapshot( PaxosInstanceStore store ) { PaxosInstance snap = new PaxosInstance( store, id ); snap.state = state; snap.ballot = ballot; - snap.acceptors = acceptors == null ? null : new ArrayList<>(acceptors); - snap.promises = promises == null ? null : new ArrayList<>(promises); - snap.accepts = accepts == null ? null : new ArrayList<>(accepts); - snap.rejectedAccepts = rejectedAccepts == null ? null : new ArrayList<>(rejectedAccepts); + snap.acceptors = acceptors == null ? null : new ArrayList<>( acceptors ); + snap.promises = promises == null ? null : new ArrayList<>( promises ); + snap.accepts = accepts == null ? null : new ArrayList<>( accepts ); + snap.rejectedAccepts = rejectedAccepts == null ? null : new ArrayList<>( rejectedAccepts ); snap.value_1 = value_1; snap.phase1Ballot = phase1Ballot; snap.value_2 = value_2; @@ -201,7 +201,7 @@ public String toString() try { Object toStringValue1 = null; - if (value_1 != null) + if ( value_1 != null ) { if ( value_1 instanceof Payload ) { @@ -214,7 +214,7 @@ public String toString() } Object toStringValue2 = null; - if (value_2 != null) + if ( value_2 != null ) { if ( value_2 instanceof Payload ) { diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/PaxosInstanceStore.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/PaxosInstanceStore.java index 409785319006a..ad2960f11a0ff 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/PaxosInstanceStore.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/PaxosInstanceStore.java @@ -106,7 +106,7 @@ public PaxosInstanceStore snapshot() { PaxosInstanceStore snapshotStore = new PaxosInstanceStore(); snapshotStore.queued = queued; - snapshotStore.delivered = new LinkedList<>(delivered); + snapshotStore.delivered = new LinkedList<>( delivered ); for ( Map.Entry instance : instances.entrySet() ) { snapshotStore.instances.put( instance.getKey(), instance.getValue().snapshot(snapshotStore) ); diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/ProposerMessage.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/ProposerMessage.java index d3bbf938380d3..0917d86618b3e 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/ProposerMessage.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/ProposerMessage.java @@ -67,11 +67,12 @@ public Object getValue() public String toString() { Object toStringValue = value; - if (toStringValue instanceof Payload ) + if ( toStringValue instanceof Payload ) { try { - toStringValue = new AtomicBroadcastSerializer( new ObjectStreamFactory(), new ObjectStreamFactory() ).receive( (Payload) toStringValue); + toStringValue = new AtomicBroadcastSerializer( new ObjectStreamFactory(), new ObjectStreamFactory() ) + .receive( (Payload) toStringValue ); } catch ( Throwable e ) { diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/ProposerState.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/ProposerState.java index 62bde7acff015..daea4ecd00a7c 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/ProposerState.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/ProposerState.java @@ -80,8 +80,9 @@ public ProposerState handle( ProposerContext context, + " rejected from " + message.getHeader( Message.FROM ) + " with ballot " + rejectPropose.getBallot() ); + // Ignore multiple rejects on same prepare if ( instance.isState( PaxosInstance.State.p1_pending ) && - instance.getBallot() < rejectPropose.getBallot()) // Ignore multiple rejects on same prepare + instance.getBallot() < rejectPropose.getBallot() ) { long ballot = instance.ballot; while ( ballot <= rejectPropose.getBallot() ) diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/AbstractContextImpl.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/AbstractContextImpl.java index 5e67d4f1172d4..ae22e69a215cb 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/AbstractContextImpl.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/AbstractContextImpl.java @@ -115,7 +115,7 @@ public InstanceId getCoordinator() } @Override - public URI getUriForId(InstanceId node ) + public URI getUriForId( InstanceId node ) { return commonState.configuration().getUriForId( node ); } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/AcceptorContextImpl.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/AcceptorContextImpl.java index 9f85e2093abec..4fffc25e45719 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/AcceptorContextImpl.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/AcceptorContextImpl.java @@ -40,7 +40,7 @@ class AcceptorContextImpl AcceptorContextImpl( org.neo4j.cluster.InstanceId me, CommonContextState commonState, LogProvider logging, - Timeouts timeouts, AcceptorInstanceStore instanceStore) + Timeouts timeouts, AcceptorInstanceStore instanceStore ) { super( me, commonState, logging, timeouts ); this.instanceStore = instanceStore; diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ClusterContextImpl.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ClusterContextImpl.java index d73c1355ad4aa..69f769ef6bfc5 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ClusterContextImpl.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ClusterContextImpl.java @@ -514,7 +514,7 @@ public ClusterContextImpl snapshot( CommonContextState commonStateSnapshot, LogP HeartbeatContextImpl snapshotHeartbeatContext ) { return new ClusterContextImpl( me, commonStateSnapshot, logging, timeouts, - joiningInstances == null ? null : new ArrayList<>( asList(joiningInstances)), + joiningInstances == null ? null : new ArrayList<>( asList( joiningInstances ) ), joinDeniedConfigurationResponseState == null ? null : joinDeniedConfigurationResponseState.snapshot(), executor, objectOutputStreamFactory, objectInputStreamFactory, snapshotLearnerContext, snapshotHeartbeatContext, config ); diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/CommonContextState.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/CommonContextState.java index 373d7140f451a..c3c63dffa4029 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/CommonContextState.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/CommonContextState.java @@ -76,7 +76,7 @@ public void setLastKnownLearnedInstanceInCluster( long lastKnownLearnedInstanceI this.lastKnownAliveUpToDateInstance = instanceId; } } - else if (lastKnownLearnedInstanceInCluster == -1) + else if ( lastKnownLearnedInstanceInCluster == -1 ) { // Special case for clearing the state this.lastKnownLearnedInstanceInCluster = -1; diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ElectionContextImpl.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ElectionContextImpl.java index 933d4586c5c03..e6bf4fa80a974 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ElectionContextImpl.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ElectionContextImpl.java @@ -66,7 +66,7 @@ public class ElectionContextImpl { super( me, commonState, logging, timeouts ); this.electionCredentialsProvider = electionCredentialsProvider; - this.roles = new ArrayList<>( asList(roles)); + this.roles = new ArrayList<>( asList( roles ) ); this.elections = new HashMap<>(); this.clusterContext = clusterContext; this.heartbeatContext = heartbeatContext; @@ -291,34 +291,34 @@ public ElectionContextImpl snapshot( CommonContextState commonStateSnapshot, Log ElectionCredentialsProvider credentialsProvider ) { - Map electionsSnapshot = new HashMap<>(); - for ( Map.Entry election : elections.entrySet() ) + Map electionsSnapshot = new HashMap<>(); + for ( Map.Entry election : elections.entrySet() ) { electionsSnapshot.put( election.getKey(), election.getValue().snapshot() ); } return new ElectionContextImpl( me, commonStateSnapshot, logging, timeouts, snapshotClusterContext, - snapshotHeartbeatContext, new ArrayList<>(roles), electionsSnapshot, credentialsProvider ); + snapshotHeartbeatContext, new ArrayList<>( roles ), electionsSnapshot, credentialsProvider ); } private static class Election { private final WinnerStrategy winnerStrategy; - private final Map votes; + private final Map votes; private Election( WinnerStrategy winnerStrategy ) { this.winnerStrategy = winnerStrategy; - this.votes = new HashMap(); + this.votes = new HashMap(); } - private Election( WinnerStrategy winnerStrategy, HashMap votes ) + private Election( WinnerStrategy winnerStrategy, HashMap votes ) { this.votes = votes; this.winnerStrategy = winnerStrategy; } - public Map getVotes() + public Map getVotes() { return votes; } @@ -330,7 +330,7 @@ public InstanceId pickWinner() public Election snapshot() { - return new Election( winnerStrategy, new HashMap<>(votes)); + return new Election( winnerStrategy, new HashMap<>( votes ) ); } } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/MultiPaxosContext.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/MultiPaxosContext.java index b5e3147bf1a91..83a70d2e454ba 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/MultiPaxosContext.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/MultiPaxosContext.java @@ -73,13 +73,16 @@ public MultiPaxosContext( InstanceId me, commonState = new CommonContextState( configuration, config.get( ClusterSettings.max_acceptors ) ); paxosInstances = new PaxosInstanceStore(); - heartbeatContext = new HeartbeatContextImpl(me, commonState, logging, timeouts, executor ); - learnerContext = new LearnerContextImpl(me, commonState, logging, timeouts, paxosInstances, instanceStore, objectInputStreamFactory, objectOutputStreamFactory, heartbeatContext ); - clusterContext = new ClusterContextImpl(me, commonState, logging, timeouts, executor, objectOutputStreamFactory, objectInputStreamFactory, learnerContext, heartbeatContext, config ); - electionContext = new ElectionContextImpl( me, commonState, logging, timeouts, roles, clusterContext, heartbeatContext, electionCredentialsProvider ); - proposerContext = new ProposerContextImpl(me, commonState, logging, timeouts, paxosInstances, heartbeatContext ); - acceptorContext = new AcceptorContextImpl(me, commonState, logging, timeouts, instanceStore); - atomicBroadcastContext = new AtomicBroadcastContextImpl(me, commonState, logging, timeouts, executor, heartbeatContext ); + heartbeatContext = new HeartbeatContextImpl( me, commonState, logging, timeouts, executor ); + learnerContext = new LearnerContextImpl( me, commonState, logging, timeouts, paxosInstances, instanceStore, + objectInputStreamFactory, objectOutputStreamFactory, heartbeatContext ); + clusterContext = new ClusterContextImpl( me, commonState, logging, timeouts, executor, objectOutputStreamFactory, + objectInputStreamFactory, learnerContext, heartbeatContext, config ); + electionContext = new ElectionContextImpl( me, commonState, logging, timeouts, roles, clusterContext, heartbeatContext, + electionCredentialsProvider ); + proposerContext = new ProposerContextImpl( me, commonState, logging, timeouts, paxosInstances, heartbeatContext ); + acceptorContext = new AcceptorContextImpl( me, commonState, logging, timeouts, instanceStore ); + atomicBroadcastContext = new AtomicBroadcastContextImpl( me, commonState, logging, timeouts, executor, heartbeatContext ); heartbeatContext.setCircularDependencies( clusterContext, learnerContext ); } @@ -138,11 +141,11 @@ public AtomicBroadcastContextImpl getAtomicBroadcastContext() /** Create a state snapshot. The snapshot will not duplicate services, and expects the caller to duplicate * {@link AcceptorInstanceStore}, since that is externally provided. */ - public MultiPaxosContext snapshot(LogProvider logging, Timeouts timeouts, Executor executor, + public MultiPaxosContext snapshot( LogProvider logging, Timeouts timeouts, Executor executor, AcceptorInstanceStore instanceStore, ObjectInputStreamFactory objectInputStreamFactory, ObjectOutputStreamFactory objectOutputStreamFactory, - ElectionCredentialsProvider electionCredentialsProvider) + ElectionCredentialsProvider electionCredentialsProvider ) { CommonContextState commonStateSnapshot = commonState.snapshot( logging.getLog( ClusterConfiguration.class ) ); PaxosInstanceStore paxosInstancesSnapshot = paxosInstances.snapshot(); diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ProposerContextImpl.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ProposerContextImpl.java index 8ec6b9afb4205..39c6317c5e3ad 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ProposerContextImpl.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ProposerContextImpl.java @@ -39,9 +39,8 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.logging.LogProvider; -import static org.neo4j.helpers.collection.Iterables.limit; - import static org.neo4j.helpers.collection.Iterables.asList; +import static org.neo4j.helpers.collection.Iterables.limit; class ProposerContextImpl @@ -72,7 +71,7 @@ class ProposerContextImpl private ProposerContextImpl( org.neo4j.cluster.InstanceId me, CommonContextState commonState, LogProvider logging, Timeouts timeouts, Deque pendingValues, Map bookedInstances, PaxosInstanceStore paxosInstances, - HeartbeatContext heartbeatContext) + HeartbeatContext heartbeatContext ) { super( me, commonState, logging, timeouts ); this.pendingValues = pendingValues; @@ -235,7 +234,7 @@ public ProposerContextImpl snapshot( CommonContextState commonStateSnapshot, Log PaxosInstanceStore paxosInstancesSnapshot, HeartbeatContext heartbeatContext ) { return new ProposerContextImpl( me, commonStateSnapshot, logging, timeouts, new LinkedList<>( pendingValues ), - new HashMap<>(bookedInstances), paxosInstancesSnapshot, heartbeatContext ); + new HashMap<>( bookedInstances ), paxosInstancesSnapshot, heartbeatContext ); } @Override diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/cluster/Cluster.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/cluster/Cluster.java index 6f5d5a4ddc391..7db3d60c5763b 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/cluster/Cluster.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/cluster/Cluster.java @@ -30,10 +30,13 @@ */ public interface Cluster { - void create(String clusterName); - Future join(String clusterName, URI... otherServerUrls); + void create( String clusterName ); + + Future join( String clusterName, URI... otherServerUrls ); + void leave(); - void addClusterListener( ClusterListener listener); - void removeClusterListener( ClusterListener listener); + void addClusterListener( ClusterListener listener ); + + void removeClusterListener( ClusterListener listener ); } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/cluster/ClusterConfiguration.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/cluster/ClusterConfiguration.java index 52d3c8adaa75e..ff8d6e030229e 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/cluster/ClusterConfiguration.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/cluster/ClusterConfiguration.java @@ -75,7 +75,7 @@ public ClusterConfiguration( String name, LogProvider logProvider, Collection(roles), new HashMap<>(nodes), + return new ConfigurationResponseState( new HashMap<>( roles ), new HashMap<>( nodes ), latestReceivedInstanceId, clusterName ); } @@ -463,7 +463,7 @@ public static class ConfigurationTimeoutState { private final int remainingPings; - public ConfigurationTimeoutState( int remainingPings) + public ConfigurationTimeoutState( int remainingPings ) { this.remainingPings = remainingPings; } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/Snapshot.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/Snapshot.java index 7c97e4e2234b7..ee93380b13895 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/Snapshot.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/Snapshot.java @@ -26,6 +26,7 @@ */ public interface Snapshot { - void setSnapshotProvider(SnapshotProvider snapshotProvider); + void setSnapshotProvider( SnapshotProvider snapshotProvider ); + void refreshSnapshot(); } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/SnapshotContext.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/SnapshotContext.java index 5522a98fc6f64..47355a0a0c54e 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/SnapshotContext.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/SnapshotContext.java @@ -22,9 +22,6 @@ import org.neo4j.cluster.protocol.atomicbroadcast.multipaxos.LearnerContext; import org.neo4j.cluster.protocol.cluster.ClusterContext; -/** - * TODO - */ public class SnapshotContext { private SnapshotProvider snapshotProvider; @@ -37,7 +34,7 @@ public SnapshotContext( ClusterContext clusterContext, LearnerContext learnerCon this.learnerContext = learnerContext; } - public void setSnapshotProvider( SnapshotProvider snapshotProvider) + public void setSnapshotProvider( SnapshotProvider snapshotProvider ) { this.snapshotProvider = snapshotProvider; } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/SnapshotProvider.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/SnapshotProvider.java index 1d85ec43cc175..3cd93133c53d5 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/SnapshotProvider.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/SnapshotProvider.java @@ -28,8 +28,7 @@ */ public interface SnapshotProvider { - void getState(ObjectOutputStream output) - throws IOException; - void setState(ObjectInputStream input) - throws IOException, ClassNotFoundException; + void getState( ObjectOutputStream output ) throws IOException; + + void setState( ObjectInputStream input ) throws IOException, ClassNotFoundException; } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/SnapshotState.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/SnapshotState.java index 63e11bd9c4dde..f1f641048a5a2 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/SnapshotState.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/snapshot/SnapshotState.java @@ -152,9 +152,10 @@ public enum SnapshotState case sendSnapshot: { outgoing.offer( Message.respond( SnapshotMessage.snapshot, message, - new SnapshotMessage.SnapshotState( context.getLearnerContext() - .getLastDeliveredInstanceId(), context.getSnapshotProvider(), - context.getClusterContext().getObjectOutputStreamFactory()) ) ); + new SnapshotMessage.SnapshotState( + context.getLearnerContext().getLastDeliveredInstanceId(), + context.getSnapshotProvider(), + context.getClusterContext().getObjectOutputStreamFactory() ) ) ); break; } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateMachineProxyFactory.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateMachineProxyFactory.java index 8336aba7b341c..d0d9da26fd580 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateMachineProxyFactory.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateMachineProxyFactory.java @@ -261,7 +261,7 @@ public synchronized Object get() return getResult(); } - while (response == null) + while ( response == null ) { this.wait( 50 ); } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateMachineRules.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateMachineRules.java index 07226a48563df..5ba2c5fd6eae9 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateMachineRules.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateMachineRules.java @@ -36,7 +36,7 @@ public class StateMachineRules { private final MessageHolder outgoing; - private Map,List> rules = new HashMap, List>( ); + private Map,List> rules = new HashMap<>(); public StateMachineRules( MessageHolder outgoing ) { @@ -49,14 +49,8 @@ public StateMachineRules rule( State oldState, Message... messages ) { - List fromRules = rules.get( oldState ); - if (fromRules == null) - { - fromRules = new ArrayList( ); - rules.put( oldState, fromRules ); - } + List fromRules = rules.computeIfAbsent( oldState, k -> new ArrayList<>() ); fromRules.add( new StateMachineRule( oldState, messageType, newState, messages ) ); - return this; } @@ -64,7 +58,7 @@ public StateMachineRules rule( State oldState, public void stateTransition( StateTransition transition ) { List oldStateRules = rules.get( transition.getOldState() ); - if (oldStateRules != null) + if ( oldStateRules != null ) { for ( StateMachineRule oldStateRule : oldStateRules ) { @@ -93,9 +87,9 @@ private StateMachineRule( State oldState, MessageType messageType, State message : messages ) { diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateTransitionListener.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateTransitionListener.java index e651c343555ca..6efe6bbb1656c 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateTransitionListener.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateTransitionListener.java @@ -25,5 +25,5 @@ */ public interface StateTransitionListener { - void stateTransition(StateTransition transition); + void stateTransition( StateTransition transition ); } diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateTransitionLogger.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateTransitionLogger.java index b7abbee34d0ae..ef405ca2d10fb 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateTransitionLogger.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/statemachine/StateTransitionLogger.java @@ -83,11 +83,11 @@ public void stateTransition( StateTransition transition ) Object payload = transition.getMessage().getPayload(); if ( payload != null ) { - if (payload instanceof Payload ) + if ( payload instanceof Payload ) { try { - payload = atomicBroadcastSerializer.receive( (Payload) payload); + payload = atomicBroadcastSerializer.receive( (Payload) payload ); } catch ( Throwable e ) { diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/timeout/FixedTimeoutStrategy.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/timeout/FixedTimeoutStrategy.java index 34afef5559826..b0d78c4842bbc 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/timeout/FixedTimeoutStrategy.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/timeout/FixedTimeoutStrategy.java @@ -30,7 +30,7 @@ public class FixedTimeoutStrategy protected final long timeout; - public FixedTimeoutStrategy(long timeout) + public FixedTimeoutStrategy( long timeout ) { this.timeout = timeout; } @@ -42,15 +42,13 @@ public long timeoutFor( Message message ) } @Override - public void timeoutTriggered(Message timeoutMessage) + public void timeoutTriggered( Message timeoutMessage ) { - //To change body of implemented methods use File | Settings | File Templates. } @Override - public void timeoutCancelled(Message timeoutMessage) + public void timeoutCancelled( Message timeoutMessage ) { - //To change body of implemented methods use File | Settings | File Templates. } @Override diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/timeout/Timeouts.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/timeout/Timeouts.java index debc1364a5ae7..3036f5e32678c 100644 --- a/enterprise/cluster/src/main/java/org/neo4j/cluster/timeout/Timeouts.java +++ b/enterprise/cluster/src/main/java/org/neo4j/cluster/timeout/Timeouts.java @@ -52,7 +52,7 @@ public Timeouts( TimeoutStrategy timeoutStrategy ) @Override public void addMessageProcessor( MessageProcessor messageProcessor ) { - if (receiver != null) + if ( receiver != null ) { throw new UnsupportedOperationException( "Timeouts does not yet support multiple message processors" ); } diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/FixedNetworkLatencyStrategy.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/FixedNetworkLatencyStrategy.java index 2a9257743feef..06a3c7e337692 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/FixedNetworkLatencyStrategy.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/FixedNetworkLatencyStrategy.java @@ -32,16 +32,16 @@ public class FixedNetworkLatencyStrategy public FixedNetworkLatencyStrategy() { - this(0); + this( 0 ); } - public FixedNetworkLatencyStrategy(long delay) + public FixedNetworkLatencyStrategy( long delay ) { this.delay = delay; } @Override - public long messageDelay(Message message, String serverIdTo) + public long messageDelay( Message message, String serverIdTo ) { return delay; } diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/MultipleFailureLatencyStrategy.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/MultipleFailureLatencyStrategy.java index cc9c9911c9090..72572a786d6f3 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/MultipleFailureLatencyStrategy.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/MultipleFailureLatencyStrategy.java @@ -30,12 +30,12 @@ public class MultipleFailureLatencyStrategy { private final NetworkLatencyStrategy[] strategies; - public MultipleFailureLatencyStrategy(NetworkLatencyStrategy... strategies) + public MultipleFailureLatencyStrategy( NetworkLatencyStrategy... strategies ) { this.strategies = strategies; } - public T getStrategy(Class strategyClass) + public T getStrategy( Class strategyClass ) { for ( NetworkLatencyStrategy strategy : strategies ) { @@ -48,12 +48,12 @@ public T getStrategy(Class strategyClass) } @Override - public long messageDelay(Message message, String serverIdTo) + public long messageDelay( Message message, String serverIdTo ) { long totalDelay = 0; - for (NetworkLatencyStrategy strategy : strategies) + for ( NetworkLatencyStrategy strategy : strategies ) { - long delay = strategy.messageDelay(message, serverIdTo); + long delay = strategy.messageDelay( message, serverIdTo ); if ( delay == LOST ) { return delay; diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/NetworkLatencyStrategy.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/NetworkLatencyStrategy.java index 8e869db87d52b..f605c7fdd65c8 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/NetworkLatencyStrategy.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/NetworkLatencyStrategy.java @@ -29,5 +29,5 @@ public interface NetworkLatencyStrategy { long LOST = -1; - long messageDelay(Message message, String serverIdTo); + long messageDelay( Message message, String serverIdTo ); } diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/RandomDropNetworkFailureLatencyStrategy.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/RandomDropNetworkFailureLatencyStrategy.java index 19630fc36db8a..a6351b6126fb6 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/RandomDropNetworkFailureLatencyStrategy.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/RandomDropNetworkFailureLatencyStrategy.java @@ -38,7 +38,7 @@ public class RandomDropNetworkFailureLatencyStrategy * @param seed Provide a seed for the Random, in order to produce repeatable tests. * @param rate 1.0=no dropped messages, 0.0=all messages are lost */ - public RandomDropNetworkFailureLatencyStrategy(long seed, double rate) + public RandomDropNetworkFailureLatencyStrategy( long seed, double rate ) { setRate( rate ); this.random = new Random( seed ); @@ -50,7 +50,7 @@ public void setRate( double rate ) } @Override - public long messageDelay(Message message, String serverIdTo) + public long messageDelay( Message message, String serverIdTo ) { return random.nextDouble() > rate ? 0 : LOST; } diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/ScriptableNetworkFailureLatencyStrategy.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/ScriptableNetworkFailureLatencyStrategy.java index 30a7d2f809e14..560dd8bc33802 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/ScriptableNetworkFailureLatencyStrategy.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/ScriptableNetworkFailureLatencyStrategy.java @@ -32,37 +32,37 @@ public class ScriptableNetworkFailureLatencyStrategy implements NetworkLatencyStrategy { - List nodesDown = new ArrayList( ); - List linksDown = new ArrayList( ); + List nodesDown = new ArrayList(); + List linksDown = new ArrayList(); - public ScriptableNetworkFailureLatencyStrategy nodeIsDown(String id) + public ScriptableNetworkFailureLatencyStrategy nodeIsDown( String id ) { nodesDown.add( id ); return this; } - public ScriptableNetworkFailureLatencyStrategy nodeIsUp(String id) + public ScriptableNetworkFailureLatencyStrategy nodeIsUp( String id ) { nodesDown.remove( id ); return this; } - public ScriptableNetworkFailureLatencyStrategy linkIsDown(String node1, String node2) + public ScriptableNetworkFailureLatencyStrategy linkIsDown( String node1, String node2 ) { linksDown.add( new String[]{node1, node2} ); - linksDown.add( new String[]{ node2, node1 } ); + linksDown.add( new String[]{node2, node1} ); return this; } - public ScriptableNetworkFailureLatencyStrategy linkIsUp(String node1, String node2) + public ScriptableNetworkFailureLatencyStrategy linkIsUp( String node1, String node2 ) { - linksDown.remove( new String[]{ node1, node2 } ); - linksDown.remove( new String[]{ node2, node1 } ); + linksDown.remove( new String[]{node1, node2} ); + linksDown.remove( new String[]{node2, node1} ); return this; } @Override - public long messageDelay(Message message, String serverIdTo) + public long messageDelay( Message message, String serverIdTo ) { if ( nodesDown.contains( serverIdTo ) || nodesDown.contains( message.getHeader( Message.FROM ) ) ) { diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/DefaultWinnerStrategyTest.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/DefaultWinnerStrategyTest.java index 570cece256e94..8575dd6063753 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/DefaultWinnerStrategyTest.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/DefaultWinnerStrategyTest.java @@ -142,8 +142,8 @@ public Log getLog( String name ) // when Collection votes = Arrays.asList( - new Vote( instanceOne, new IntegerElectionCredentials(1) ), - new Vote( instanceTwo, new IntegerElectionCredentials(2) ) ); + new Vote( instanceOne, new IntegerElectionCredentials( 1 ) ), + new Vote( instanceTwo, new IntegerElectionCredentials( 2 ) ) ); DefaultWinnerStrategy strategy = new DefaultWinnerStrategy( clusterContext ); org.neo4j.cluster.InstanceId winner = strategy.pickWinner( votes ); diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/MultiPaxosContextTest.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/MultiPaxosContextTest.java index 7c4406a52d647..65e913af6b790 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/MultiPaxosContextTest.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/MultiPaxosContextTest.java @@ -66,9 +66,11 @@ public void shouldNotConsiderInstanceJoiningWithSameIdAndIpAProblem() throws Exc ctx.getClusterContext().instanceIsJoining( joiningId, new URI( joiningUri ) ); // Then - assertFalse( ctx.getClusterContext().isInstanceJoiningFromDifferentUri( joiningId, new URI( joiningUri ) )); - assertTrue( ctx.getClusterContext().isInstanceJoiningFromDifferentUri( joiningId, new URI("http://127.0.0.1:80"))); - assertFalse( ctx.getClusterContext().isInstanceJoiningFromDifferentUri( new InstanceId( 13 ), new URI( joiningUri ) ) ); + assertFalse( ctx.getClusterContext().isInstanceJoiningFromDifferentUri( joiningId, new URI( joiningUri ) ) ); + assertTrue( ctx.getClusterContext() + .isInstanceJoiningFromDifferentUri( joiningId, new URI( "http://127.0.0.1:80" ) ) ); + assertFalse( ctx.getClusterContext() + .isInstanceJoiningFromDifferentUri( new InstanceId( 13 ), new URI( joiningUri ) ) ); } @Test diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/MultiPaxosServerCluster.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/MultiPaxosServerCluster.java deleted file mode 100644 index 67a276569e9a7..0000000000000 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/MultiPaxosServerCluster.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Copyright (c) 2002-2017 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.neo4j.cluster.protocol.atomicbroadcast.multipaxos; - -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.util.ArrayList; -import java.util.List; - -import org.neo4j.test.ProcessStreamHandler; - -import static org.neo4j.test.StreamConsumer.PRINT_FAILURES; - -/** - * TODO - */ -public class MultiPaxosServerCluster -{ - public static void main( String[] args ) - throws IOException, InterruptedException - { - new MultiPaxosServerCluster(3); - } - - List servers = new ArrayList( ); - - public MultiPaxosServerCluster(int count) - throws IOException, InterruptedException - { - String processCommand = "java " + MultiPaxosServer.class.getName(); - for ( int i = 0; i < count; i++ ) - { - Process server = Runtime.getRuntime().exec( processCommand, - new String[]{"CLASSPATH=\"" + System.getProperty( "java.class.path" ) + "\""} ); - sleep( 500 ); - servers.add( new PaxosServer( server, "[" + (i + 1) + "] " ) ); - } - - sleep( 3000 ); -// all( "logging org.neo4j.kernel.ha2.protocol off" ); - send( 1, "create default" ); - send( 2, "join neo4j://localhost:5001" ); - send( 3, "join neo4j://localhost:5001" ); - - sleep( 6000 ); - - send( 1, "broadcast hello" ); - - sleep( 10000 ); - - send( 1, "leave" ); - sleep( 1000 ); - send( 2, "leave" ); - sleep( 1000 ); - send( 1, "join neo4j://localhost:5003" ); - send( 2, "join neo4j://localhost:5003" ); - sleep( 6000 ); - send( 3, "promote neo4j://127.0.0.1:5001 coordinator" ); - sleep( 6000 ); - - send( 1, "broadcast hello2" ); - - for ( int i = 0; i < servers.size(); i++ ) - { - sleep( 3000 ); - PaxosServer paxosServer = servers.get( i ); - paxosServer.quit(); - } - } - - private void sleep( int i ) - throws InterruptedException - { - Thread.sleep( i ); - } - - private void send( int i, String s ) - throws IOException - { - servers.get( i - 1 ).command( s ); - } - - private void all(String command) - throws IOException - { - for ( PaxosServer server : servers ) - { - server.command( command ); - } - } - - public static class PaxosServer - { - Process server; - ProcessStreamHandler handler; - BufferedWriter writer; - - public PaxosServer( Process server, String prefix ) - { - this.server = server; - handler = new ProcessStreamHandler( server, false, prefix, PRINT_FAILURES ); - handler.launch(); - writer = new BufferedWriter( new OutputStreamWriter(server.getOutputStream())); - } - - public void command( String cmd ) throws IOException - { - writer.write( cmd + "\n" ); - writer.flush(); - } - - public void quit() - throws IOException - { - command( "quit" ); - handler.done(); - } - } -} diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ClusterContextImplTest.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ClusterContextImplTest.java index a2262490efd96..ebae02c12c353 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ClusterContextImplTest.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ClusterContextImplTest.java @@ -270,7 +270,7 @@ public void shouldGracefullyHandleEmptyDiscoveryHeader() throws Exception HeartbeatContext heartbeatContext = mock( HeartbeatContext.class ); - ClusterContext context = new ClusterContextImpl(me, commonContextState, NullLogProvider.getInstance(), + ClusterContext context = new ClusterContextImpl( me, commonContextState, NullLogProvider.getInstance(), timeouts, executor, mock( ObjectOutputStreamFactory.class ), mock( ObjectInputStreamFactory.class ), mock( LearnerContext.class ), heartbeatContext, mock( Config.class ) ); @@ -300,7 +300,7 @@ public void shouldUpdateDiscoveryHeaderWithContactingInstances() throws Exceptio HeartbeatContext heartbeatContext = mock( HeartbeatContext.class ); - ClusterContext context = new ClusterContextImpl(me, commonContextState, NullLogProvider.getInstance(), + ClusterContext context = new ClusterContextImpl( me, commonContextState, NullLogProvider.getInstance(), timeouts, executor, mock( ObjectOutputStreamFactory.class ), mock( ObjectInputStreamFactory.class ), mock( LearnerContext.class ), heartbeatContext, mock( Config.class ) ); @@ -335,7 +335,7 @@ public void shouldKeepTrackOfInstancesWeHaveContacted() throws Exception HeartbeatContext heartbeatContext = mock( HeartbeatContext.class ); - ClusterContext context = new ClusterContextImpl(me, commonContextState, NullLogProvider.getInstance(), + ClusterContext context = new ClusterContextImpl( me, commonContextState, NullLogProvider.getInstance(), timeouts, executor, mock( ObjectOutputStreamFactory.class ), mock( ObjectInputStreamFactory.class ), mock( LearnerContext.class ), heartbeatContext, mock( Config.class ) ); diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterMembershipTest.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterMembershipTest.java index c0349ff98a72d..6359012172704 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterMembershipTest.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterMembershipTest.java @@ -19,13 +19,13 @@ */ package org.neo4j.cluster.protocol.cluster; +import org.junit.Ignore; +import org.junit.Test; + import java.net.URISyntaxException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; -import org.junit.Ignore; -import org.junit.Test; - /** * TODO */ @@ -143,7 +143,7 @@ public void twoNodesJoinThenOneLeavesAsThirdJoins() } @Test - @Ignore("instance 1 is in start, 2 in discovery. Correct but we don't have a way to verify it yet") + @Ignore( "instance 1 is in start, 2 in discovery. Correct but we don't have a way to verify it yet" ) public void oneNodeCreatesClusterAndThenAnotherJoinsAsFirstLeaves() throws URISyntaxException, ExecutionException, TimeoutException, InterruptedException { diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterNetworkTest.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterNetworkTest.java index ddb0c5b1430d9..e21c0acaabd18 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterNetworkTest.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterNetworkTest.java @@ -65,7 +65,7 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.LoggerRule; -@RunWith(value = Parameterized.class) +@RunWith( value = Parameterized.class ) public class ClusterNetworkTest { @Parameterized.Parameters diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterRandomTest.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterRandomTest.java deleted file mode 100644 index b48d7d88327f8..0000000000000 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterRandomTest.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2002-2017 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.neo4j.cluster.protocol.cluster; - -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeoutException; - -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -/** - * TODO - */ -@Ignore -@RunWith(Parameterized.class) -public class ClusterRandomTest - extends ClusterMockTest -{ - @Parameterized.Parameters - public static Collection data() - { - return seeds( 1338272692543769000L, 1338272692343957000L, 1338272692188718000L, 1338272692117545000L, - 1338272692020413000L, 1338272691938947000L, 1338272691895131000L, 1338272691832332000L, - 1338272691540039000L, - 1338272632660010000L, 1337830212532839000L ); - -// return seeds( 1349765117306363000L ); - // return seeds( -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 ); - } - - private static Collection seeds( long... s ) - { - List seedList = new ArrayList(); - for ( long seed : s ) - { - seedList.add( new Object[]{seed} ); - } - return seedList; - } - - final long seed; - - public ClusterRandomTest( long s ) - { - seed = s; - } - - @Test - public void randomTest() - throws URISyntaxException, ExecutionException, TimeoutException, InterruptedException - { - testCluster( 7, DEFAULT_NETWORK(), new ClusterTestScriptRandom( seed ) ); - } -} diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/election/ElectionContextTest.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/election/ElectionContextTest.java index 0a5a1a2b0686b..3c13ca8febc95 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/election/ElectionContextTest.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/election/ElectionContextTest.java @@ -135,12 +135,12 @@ public void testElectionNotOkQuorumFailedFourInstances() ClusterContext clusterContext = mock( ClusterContext.class ); when( clusterContext.getConfiguration() ).thenReturn( clusterConfiguration ); - MultiPaxosContext context = new MultiPaxosContext( new InstanceId(1), Iterables.iterable( - new ElectionRole( "coordinator" ) ), clusterConfiguration, - mock( Executor.class ), NullLogProvider.getInstance(), - mock( ObjectInputStreamFactory.class ), mock( ObjectOutputStreamFactory.class ), - mock( AcceptorInstanceStore.class ), mock( Timeouts.class ), - mock( ElectionCredentialsProvider.class), config ); + MultiPaxosContext context = + new MultiPaxosContext( new InstanceId( 1 ), Iterables.iterable( new ElectionRole( "coordinator" ) ), + clusterConfiguration, mock( Executor.class ), NullLogProvider.getInstance(), + mock( ObjectInputStreamFactory.class ), mock( ObjectOutputStreamFactory.class ), + mock( AcceptorInstanceStore.class ), mock( Timeouts.class ), + mock( ElectionCredentialsProvider.class ), config ); context.getHeartbeatContext().getFailed().addAll( failed ); @@ -173,12 +173,12 @@ public void testElectionNotOkQuorumFailedFiveInstances() ClusterContext clusterContext = mock( ClusterContext.class ); when( clusterContext.getConfiguration() ).thenReturn( clusterConfiguration ); - MultiPaxosContext context = new MultiPaxosContext( new InstanceId(1), Iterables.iterable( - new ElectionRole( "coordinator" ) ), clusterConfiguration, - mock( Executor.class ), NullLogProvider.getInstance(), - mock( ObjectInputStreamFactory.class ), mock( ObjectOutputStreamFactory.class ), - mock( AcceptorInstanceStore.class ), mock( Timeouts.class ), - mock( ElectionCredentialsProvider.class), config ); + MultiPaxosContext context = + new MultiPaxosContext( new InstanceId( 1 ), Iterables.iterable( new ElectionRole( "coordinator" ) ), + clusterConfiguration, mock( Executor.class ), NullLogProvider.getInstance(), + mock( ObjectInputStreamFactory.class ), mock( ObjectOutputStreamFactory.class ), + mock( AcceptorInstanceStore.class ), mock( Timeouts.class ), + mock( ElectionCredentialsProvider.class ), config ); context.getHeartbeatContext().getFailed().addAll( failed ); @@ -209,12 +209,12 @@ public void twoVotesFromSameInstanceForSameRoleShouldBeConsolidated() throws Exc ClusterContext clusterContext = mock( ClusterContext.class ); when( clusterContext.getConfiguration() ).thenReturn( clusterConfiguration ); - MultiPaxosContext context = new MultiPaxosContext( new InstanceId(1), Iterables.iterable( - new ElectionRole( coordinatorRole ) ), clusterConfiguration, - mock( Executor.class ), NullLogProvider.getInstance(), + MultiPaxosContext context = + new MultiPaxosContext( new InstanceId( 1 ), Iterables.iterable( new ElectionRole( coordinatorRole ) ), + clusterConfiguration, mock( Executor.class ), NullLogProvider.getInstance(), mock( ObjectInputStreamFactory.class ), mock( ObjectOutputStreamFactory.class ), - mock( AcceptorInstanceStore.class ), mock( Timeouts.class ), - mock( ElectionCredentialsProvider.class), config ); + mock( AcceptorInstanceStore.class ), mock( Timeouts.class ), + mock( ElectionCredentialsProvider.class ), config ); ElectionContext toTest = context.getElectionContext(); @@ -240,12 +240,12 @@ public void electionBeingForgottenMustIncreaseElectionId() throws Exception Config config = mock( Config.class ); when( config.get( ClusterSettings.max_acceptors ) ).thenReturn( 10 ); - ElectionContext context = new MultiPaxosContext( new InstanceId(1), Iterables.iterable( - new ElectionRole( coordinatorRole ) ), mock( ClusterConfiguration.class ), - mock( Executor.class ), NullLogProvider.getInstance(), - mock( ObjectInputStreamFactory.class ), mock( ObjectOutputStreamFactory.class ), - mock( AcceptorInstanceStore.class ), mock( Timeouts.class ), - mock( ElectionCredentialsProvider.class ), config ).getElectionContext(); + ElectionContext context = + new MultiPaxosContext( new InstanceId( 1 ), Iterables.iterable( new ElectionRole( coordinatorRole ) ), + mock( ClusterConfiguration.class ), mock( Executor.class ), NullLogProvider.getInstance(), + mock( ObjectInputStreamFactory.class ), mock( ObjectOutputStreamFactory.class ), + mock( AcceptorInstanceStore.class ), mock( Timeouts.class ), + mock( ElectionCredentialsProvider.class ), config ).getElectionContext(); ElectionContext.VoteRequest voteRequestBefore = context.voteRequestForRole( new ElectionRole( coordinatorRole ) ); context.forgetElection( coordinatorRole ); @@ -264,13 +264,12 @@ public void voteFromPreviousSuccessfulElectionMustNotBeCounted() throws Exceptio Config config = mock( Config.class ); when( config.get( ClusterSettings.max_acceptors ) ).thenReturn( 10 ); - ElectionContext context = new MultiPaxosContext( new InstanceId(1), Iterables.iterable( - new ElectionRole( coordinatorRole ) ), mock( ClusterConfiguration.class ), - mock( Executor.class ), NullLogProvider.getInstance(), - mock( ObjectInputStreamFactory.class ), mock( ObjectOutputStreamFactory.class ), - mock( AcceptorInstanceStore.class ), mock( Timeouts.class ), mock( ElectionCredentialsProvider.class ), - config - ).getElectionContext(); + ElectionContext context = + new MultiPaxosContext( new InstanceId( 1 ), Iterables.iterable( new ElectionRole( coordinatorRole ) ), + mock( ClusterConfiguration.class ), mock( Executor.class ), NullLogProvider.getInstance(), + mock( ObjectInputStreamFactory.class ), mock( ObjectOutputStreamFactory.class ), + mock( AcceptorInstanceStore.class ), mock( Timeouts.class ), + mock( ElectionCredentialsProvider.class ), config ).getElectionContext(); // When ElectionContext.VoteRequest voteRequestBefore = context.voteRequestForRole( new ElectionRole( coordinatorRole ) ); @@ -462,12 +461,12 @@ private void baseTestForElectionOk( Set failed, boolean moreThanQuor ClusterContext clusterContext = mock( ClusterContext.class ); when( clusterContext.getConfiguration() ).thenReturn( clusterConfiguration ); - MultiPaxosContext context = new MultiPaxosContext( new InstanceId(1), Iterables.iterable( - new ElectionRole( "coordinator" ) ), clusterConfiguration, - mock( Executor.class ), NullLogProvider.getInstance(), + MultiPaxosContext context = + new MultiPaxosContext( new InstanceId( 1 ), Iterables.iterable( new ElectionRole( "coordinator" ) ), + clusterConfiguration, mock( Executor.class ), NullLogProvider.getInstance(), mock( ObjectInputStreamFactory.class ), mock( ObjectOutputStreamFactory.class ), - mock( AcceptorInstanceStore.class ), mock( Timeouts.class ), - mock( ElectionCredentialsProvider.class), config ); + mock( AcceptorInstanceStore.class ), mock( Timeouts.class ), + mock( ElectionCredentialsProvider.class ), config ); context.getHeartbeatContext().getFailed().addAll( failed ); diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/snapshot/SnapshotStateTest.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/snapshot/SnapshotStateTest.java index 192cec5448323..83d3fcf9bdd62 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/snapshot/SnapshotStateTest.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/snapshot/SnapshotStateTest.java @@ -19,23 +19,24 @@ */ package org.neo4j.cluster.protocol.snapshot; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import org.junit.Test; +import org.mockito.Mockito; import java.net.URI; import java.util.HashMap; import java.util.Map; -import org.junit.Test; -import org.mockito.Mockito; import org.neo4j.cluster.InstanceId; import org.neo4j.cluster.com.message.Message; import org.neo4j.cluster.com.message.MessageHolder; import org.neo4j.cluster.protocol.cluster.ClusterConfiguration; import org.neo4j.cluster.protocol.cluster.ClusterContext; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class SnapshotStateTest { @Test @@ -54,11 +55,11 @@ public void testNoSnapshotRequestIfOnlyMember() throws Throwable baseNoSendTest( extraMember ); } - public void baseNoSendTest( Map extraMembers) throws Throwable + public void baseNoSendTest( Map extraMembers ) throws Throwable { URI me = URI.create( "cluster://me" ); - Map members = new HashMap(); + Map members = new HashMap(); final InstanceId myId = new InstanceId( 1 ); members.put( myId, me ); members.putAll( extraMembers ); diff --git a/enterprise/com/src/main/java/org/neo4j/com/Client.java b/enterprise/com/src/main/java/org/neo4j/com/Client.java index 87c004ed0b718..433d954efd28f 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/Client.java +++ b/enterprise/com/src/main/java/org/neo4j/com/Client.java @@ -261,7 +261,7 @@ private String threadInfo() */ resourcePoolReleaser = () -> { - if ( channelPool != null) + if ( channelPool != null ) { channelPool.release(); } diff --git a/enterprise/com/src/main/java/org/neo4j/com/MonitorChannelHandler.java b/enterprise/com/src/main/java/org/neo4j/com/MonitorChannelHandler.java index ab17d82723172..a98c3de71d69b 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/MonitorChannelHandler.java +++ b/enterprise/com/src/main/java/org/neo4j/com/MonitorChannelHandler.java @@ -41,9 +41,9 @@ public MonitorChannelHandler( ByteCounterMonitor byteCounterMonitor ) @Override public void messageReceived( ChannelHandlerContext ctx, MessageEvent e ) throws Exception { - if (e.getMessage() instanceof ChannelBuffer ) + if ( e.getMessage() instanceof ChannelBuffer ) { - byteCounterMonitor.bytesRead( ((ChannelBuffer)e.getMessage()).readableBytes() ); + byteCounterMonitor.bytesRead( ((ChannelBuffer) e.getMessage()).readableBytes() ); } super.messageReceived( ctx, e ); @@ -52,9 +52,9 @@ public void messageReceived( ChannelHandlerContext ctx, MessageEvent e ) throws @Override public void writeRequested( ChannelHandlerContext ctx, MessageEvent e ) throws Exception { - if (e.getMessage() instanceof ChannelBuffer ) + if ( e.getMessage() instanceof ChannelBuffer ) { - byteCounterMonitor.bytesWritten( ((ChannelBuffer)e.getMessage()).readableBytes() ); + byteCounterMonitor.bytesWritten( ((ChannelBuffer) e.getMessage()).readableBytes() ); } super.writeRequested( ctx, e ); diff --git a/enterprise/com/src/main/java/org/neo4j/com/storecopy/ExternallyManagedPageCache.java b/enterprise/com/src/main/java/org/neo4j/com/storecopy/ExternallyManagedPageCache.java index d58b83517d5cf..4f909f3944cd1 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/storecopy/ExternallyManagedPageCache.java +++ b/enterprise/com/src/main/java/org/neo4j/com/storecopy/ExternallyManagedPageCache.java @@ -22,7 +22,6 @@ import java.io.File; import java.io.IOException; import java.nio.file.OpenOption; -import java.util.Map; import java.util.Optional; import java.util.stream.Stream; @@ -39,7 +38,6 @@ import org.neo4j.kernel.impl.factory.DatabaseInfo; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; -import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory.Dependencies; import org.neo4j.kernel.impl.factory.PlatformModule; import org.neo4j.kernel.impl.logging.LogService; import org.neo4j.kernel.monitoring.tracing.Tracers; @@ -110,9 +108,10 @@ public Stream streamFilesRecursive( File directory ) throws IOExcept /** * Create a GraphDatabaseFactory that will build EmbeddedGraphDatabase instances that all use the given page cache. */ - public static GraphDatabaseFactoryWithPageCacheFactory graphDatabaseFactoryWithPageCache( final PageCache delegatePageCache ) + public static GraphDatabaseFactoryWithPageCacheFactory graphDatabaseFactoryWithPageCache( + final PageCache delegatePageCache ) { - return new GraphDatabaseFactoryWithPageCacheFactory( delegatePageCache); + return new GraphDatabaseFactoryWithPageCacheFactory( delegatePageCache ); } public static class GraphDatabaseFactoryWithPageCacheFactory extends GraphDatabaseFactory diff --git a/enterprise/com/src/main/java/org/neo4j/com/storecopy/MoveAfterCopy.java b/enterprise/com/src/main/java/org/neo4j/com/storecopy/MoveAfterCopy.java index e3a14d78de419..1563c047e7b05 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/storecopy/MoveAfterCopy.java +++ b/enterprise/com/src/main/java/org/neo4j/com/storecopy/MoveAfterCopy.java @@ -29,7 +29,7 @@ public interface MoveAfterCopy static MoveAfterCopy moveReplaceExisting() { - return (moves, fromDirectory, toDirectory) -> + return ( moves, fromDirectory, toDirectory ) -> { Iterable itr = moves::iterator; for ( FileMoveAction move : itr ) diff --git a/enterprise/com/src/test/java/org/neo4j/com/PortRangeSocketBinderTest.java b/enterprise/com/src/test/java/org/neo4j/com/PortRangeSocketBinderTest.java index af7cbc27b7b70..c21ae9062b4d1 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/PortRangeSocketBinderTest.java +++ b/enterprise/com/src/test/java/org/neo4j/com/PortRangeSocketBinderTest.java @@ -64,12 +64,12 @@ public void shouldReThrowExceptionIfCannotBindToAnyOfThePortsInTheRange() HostnamePort localhost = new HostnamePort( "localhost", 9000, 9002 ); ServerBootstrap bootstrap = mock( ServerBootstrap.class ); - when( bootstrap.bind( new InetSocketAddress( "localhost", 9000 ) ) ).thenThrow( - new ChannelException("Failed to bind to: 9000") ); - when( bootstrap.bind( new InetSocketAddress( "localhost", 9001 ) ) ).thenThrow( - new ChannelException("Failed to bind to: 9001") ); - when( bootstrap.bind( new InetSocketAddress( "localhost", 9002 ) ) ).thenThrow( - new ChannelException("Failed to bind to: 9002") ); + when( bootstrap.bind( new InetSocketAddress( "localhost", 9000 ) ) ) + .thenThrow( new ChannelException( "Failed to bind to: 9000" ) ); + when( bootstrap.bind( new InetSocketAddress( "localhost", 9001 ) ) ) + .thenThrow( new ChannelException( "Failed to bind to: 9001" ) ); + when( bootstrap.bind( new InetSocketAddress( "localhost", 9002 ) ) ) + .thenThrow( new ChannelException( "Failed to bind to: 9002" ) ); try { diff --git a/enterprise/com/src/test/java/org/neo4j/com/ResourcePoolTest.java b/enterprise/com/src/test/java/org/neo4j/com/ResourcePoolTest.java index 918e359ff838c..019ddf0b34307 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/ResourcePoolTest.java +++ b/enterprise/com/src/test/java/org/neo4j/com/ResourcePoolTest.java @@ -471,7 +471,7 @@ public void end() private class StatefulMonitor implements ResourcePool.Monitor { - public AtomicInteger currentPeakSize = new AtomicInteger(-1); + public AtomicInteger currentPeakSize = new AtomicInteger( -1 ); public AtomicInteger targetSize = new AtomicInteger( -1 ); public AtomicInteger created = new AtomicInteger( 0 ); public AtomicInteger acquired = new AtomicInteger( 0 ); diff --git a/enterprise/com/src/test/java/org/neo4j/com/TestCommunication.java b/enterprise/com/src/test/java/org/neo4j/com/TestCommunication.java index 198ad54d92d8c..6e7e1d0d52246 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/TestCommunication.java +++ b/enterprise/com/src/test/java/org/neo4j/com/TestCommunication.java @@ -103,7 +103,7 @@ private void waitUntilResponseHasBeenWritten( MadeUpServer server, int maxTime ) } } - @Test(expected = MismatchingStoreIdException.class) + @Test( expected = MismatchingStoreIdException.class ) public void makeSureClientStoreIdsMustMatch() throws Throwable { MadeUpServer server = builder.server(); @@ -113,7 +113,7 @@ public void makeSureClientStoreIdsMustMatch() throws Throwable client.multiply( 1, 2 ); } - @Test(expected = MismatchingStoreIdException.class) + @Test( expected = MismatchingStoreIdException.class ) public void makeSureServerStoreIdsMustMatch() throws Throwable { MadeUpServer server = builder.storeId( newStoreIdForCurrentVersion( 10, 10, 10, 10 ) ).server(); @@ -424,7 +424,7 @@ public void clientShouldUseHandlersToHandleComExceptions() } @Test - @SuppressWarnings("rawtypes") + @SuppressWarnings( "rawtypes" ) public void masterResponseShouldBeUnpackedIfRequestTypeRequires() throws Exception { // Given diff --git a/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/DefaultTopTable.java b/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/DefaultTopTable.java index dc4bb663524e9..3765933aae4c4 100644 --- a/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/DefaultTopTable.java +++ b/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/DefaultTopTable.java @@ -116,7 +116,7 @@ public boolean hasNext() } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public T next() { return (T) array[--cursor]; diff --git a/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/EnterpriseCypherEngineProvider.java b/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/EnterpriseCypherEngineProvider.java index 32cbc128edd13..5aeade0631f1b 100644 --- a/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/EnterpriseCypherEngineProvider.java +++ b/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/EnterpriseCypherEngineProvider.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.LogProvider; -@Service.Implementation(QueryEngineProvider.class) +@Service.Implementation( QueryEngineProvider.class ) public class EnterpriseCypherEngineProvider extends QueryEngineProvider { public EnterpriseCypherEngineProvider() diff --git a/enterprise/cypher/spec-suite-tools/src/test/java/cypher/SpecSuiteResources.java b/enterprise/cypher/spec-suite-tools/src/test/java/cypher/SpecSuiteResources.java index ae852ac38d9ed..840b93b6ad519 100644 --- a/enterprise/cypher/spec-suite-tools/src/test/java/cypher/SpecSuiteResources.java +++ b/enterprise/cypher/spec-suite-tools/src/test/java/cypher/SpecSuiteResources.java @@ -70,7 +70,7 @@ private static void unpackResources( Class klass ) Path path = fileSystem.getPath( "/" ); findAndUnpackTo( fileSystem, path, featuresDirectory, graphsDirectory ); } - catch (IllegalArgumentException e) + catch ( IllegalArgumentException e ) { // This is a workaround as the JDK doesn't give us a filesystem for subdirectories if ( "file".equals( uri.getScheme() ) ) @@ -111,7 +111,7 @@ private static void findAndUnpackTo( { System.out.println( "Unpacking to " + targetDirectory.getCanonicalPath() ); PathMatcher matcher = sourceFileSystem.getPathMatcher( sourceFilePattern ); - for (Iterator it = Files.walk( sourceRootDirectory, 3 ).iterator(); it.hasNext(); ) + for ( Iterator it = Files.walk( sourceRootDirectory, 3 ).iterator(); it.hasNext(); ) { Path next = it.next(); if ( matcher.matches( next ) ) diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaSettings.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaSettings.java index 89b3f6eb73372..b2eb6332a5f87 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaSettings.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaSettings.java @@ -20,11 +20,11 @@ package org.neo4j.kernel.ha; import org.neo4j.configuration.Description; +import org.neo4j.configuration.Internal; import org.neo4j.configuration.LoadableConfig; import org.neo4j.graphdb.config.Setting; import org.neo4j.helpers.HostnamePort; import org.neo4j.kernel.configuration.ConfigurationMigrator; -import org.neo4j.configuration.Internal; import org.neo4j.kernel.configuration.Migrator; import org.neo4j.kernel.configuration.Settings; @@ -45,7 +45,7 @@ @Description( "High Availability configuration settings" ) public class HaSettings implements LoadableConfig { - @SuppressWarnings("unused") // accessed by reflection + @SuppressWarnings( "unused" ) // accessed by reflection @Migrator public static final ConfigurationMigrator migrator = new EnterpriseConfigurationMigrator(); @@ -70,8 +70,8 @@ public class HaSettings implements LoadableConfig @Description( "Hostname and port to bind the HA server." ) public static final Setting ha_server = setting( "ha.host.data", HOSTNAME_PORT, "0.0.0.0:6001-6011" ); - @Description("Whether this instance should only participate as slave in cluster. " - + "If set to `true`, it will never be elected as master.") + @Description( "Whether this instance should only participate as slave in cluster. " + + "If set to `true`, it will never be elected as master." ) public static final Setting slave_only = setting( "ha.slave_only", BOOLEAN, Settings.FALSE ); @Description( "Policy for how to handle branched data." ) @@ -116,32 +116,35 @@ public class HaSettings implements LoadableConfig public enum BranchedDataCopyingStrategy { - @Description("First handles the branched store, then copies down a new store from the master and replaces it." + - " This strategy, when combined with the keep_last or keep_none branch handling strategies results in " + - "less space used as the store is first removed and then the copy is fetched." ) + @Description( "First handles the branched store, then copies down a new store from the master and " + + "replaces it. This strategy, when combined with the keep_last or keep_none branch handling " + + "strategies results in less space used as the store is first removed and then the copy is fetched." ) branch_then_copy, - @Description("First copies down a new store from the master, then branches the existing store and replaces it" + - ". This strategy uses potentially more space than branch_then_copy but it allows for store copy " + - "failures to be recoverable as the original store is maintained until the store copy finishes " + - "successfully." ) + @Description( "First copies down a new store from the master, then branches the existing store and " + + "replaces it. This strategy uses potentially more space than branch_then_copy but it allows " + + "for store copy failures to be recoverable as the original store is maintained until " + + "the store copy finishes successfully." ) copy_then_branch; } public enum TxPushStrategy { - @Description("Round robin") + @Description( "Round robin" ) round_robin, - @Description("Fixed, prioritized by server id in descending order. This strategy will push to the same set of instances, as long as they remain " + - "available, and will prioritize available instances with the highest instance ids.") + @Description( "Fixed, prioritized by server id in descending order. This strategy will push to the same set " + + "of instances, as long as they remain available, and will prioritize available " + + "instances with the highest instance ids." ) fixed_descending, - @Description("Fixed, prioritized by server id in ascending order. This strategy will push to the same set of instances, as long as they remain " + - "available, and will prioritize those available instances with the lowest instance ids. This strategy makes it more likely that the most " + - "up-to-date instance in a cluster will be an instance with a low id. This is consistent with the master reelection tie-breaking strategy of letting the " + - "instance with the lowest id win an election if several instances are equally up-to-date. Thus, using this strategy makes it very likely " + - "that failover will happen in a low-id part of the cluster, which can be very helpful in planning a multi-data center deployment.") + @Description( "Fixed, prioritized by server id in ascending order. This strategy will push to the same set of" + + " instances, as long as they remain available, and will prioritize those available instances " + + "with the lowest instance ids. This strategy makes it more likely that the most " + + "up-to-date instance in a cluster will be an instance with a low id. This is consistent with the master reelection tie-breaking strategy of letting the " + + "instance with the lowest id win an election if several instances are equally up-to-date. Thus, using this strategy makes it very likely " + + "that failover will happen in a low-id part of the cluster, which can be very helpful in " + + "planning a multi-data center deployment." ) fixed_ascending } } diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/SlaveUpdatePuller.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/SlaveUpdatePuller.java index 4304c172c707b..1a6151e049022 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/SlaveUpdatePuller.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/SlaveUpdatePuller.java @@ -156,7 +156,7 @@ public interface Monitor AvailabilityGuard availabilityGuard, InvalidEpochExceptionHandler invalidEpochHandler, JobScheduler jobScheduler, - Monitor monitor) + Monitor monitor ) { this.requestContextFactory = requestContextFactory; this.master = master; diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberState.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberState.java index fb09b1d9d25ae..5ec2214602866 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberState.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberState.java @@ -352,39 +352,46 @@ public boolean isAccessAllowed() ILLEGAL { @Override - public HighAvailabilityMemberState masterIsElected( HighAvailabilityMemberContext context, InstanceId masterId ) + public HighAvailabilityMemberState masterIsElected( HighAvailabilityMemberContext context, + InstanceId masterId ) { - throw new IllegalStateException("The ILLEGAL state is not meant to be used as a state, merely as an indicator that" + - " something went wrong while handling a message and the state should be set to PENDING"); + throw new IllegalStateException( + "The ILLEGAL state is not meant to be used as a state, merely as an indicator that" + + " something went wrong while handling a message and the state should be set to PENDING" ); } @Override - public HighAvailabilityMemberState masterIsAvailable( HighAvailabilityMemberContext context, InstanceId masterId, URI masterHaURI ) + public HighAvailabilityMemberState masterIsAvailable( HighAvailabilityMemberContext context, + InstanceId masterId, URI masterHaURI ) { - throw new IllegalStateException("The ILLEGAL state is not meant to be used as a state, merely as an indicator that" + - " something went wrong while handling a message and the state should be set to PENDING"); + throw new IllegalStateException( + "The ILLEGAL state is not meant to be used as a state, merely as an indicator that" + + " something went wrong while handling a message and the state should be set to PENDING" ); } @Override public HighAvailabilityMemberState slaveIsAvailable( HighAvailabilityMemberContext context, - InstanceId slaveId, URI slaveUri ) + InstanceId slaveId, URI slaveUri ) { - throw new IllegalStateException("The ILLEGAL state is not meant to be used as a state, merely as an indicator that" + - " something went wrong while handling a message and the state should be set to PENDING"); + throw new IllegalStateException( + "The ILLEGAL state is not meant to be used as a state, merely as an indicator that" + + " something went wrong while handling a message and the state should be set to PENDING" ); } @Override public boolean isEligibleForElection() { - throw new IllegalStateException("The ILLEGAL state is not meant to be used as a state, merely as an indicator that" + - " something went wrong while handling a message and the state should be set to PENDING"); + throw new IllegalStateException( + "The ILLEGAL state is not meant to be used as a state, merely as an indicator that" + + " something went wrong while handling a message and the state should be set to PENDING" ); } @Override public boolean isAccessAllowed() { - throw new IllegalStateException("The ILLEGAL state is not meant to be used as a state, merely as an indicator that" + - " something went wrong while handling a message and the state should be set to PENDING"); + throw new IllegalStateException( + "The ILLEGAL state is not meant to be used as a state, merely as an indicator that" + + " something went wrong while handling a message and the state should be set to PENDING" ); } }; diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberStateMachine.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberStateMachine.java index 256295f8871ff..6b44b6dddc13c 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberStateMachine.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberStateMachine.java @@ -208,7 +208,7 @@ else if ( role.equals( HighAvailabilityModeSwitcher.SLAVE ) ) log.debug( "Got slaveIsAvailable(" + instanceId + "), " + "moved to " + state + " from " + oldState ); final HighAvailabilityMemberChangeEvent event = new HighAvailabilityMemberChangeEvent( oldState, - state, instanceId, roleUri); + state, instanceId, roleUri ); memberListeners.notify( listener -> listener.slaveIsAvailable( event ) ); if ( oldState == HighAvailabilityMemberState.TO_SLAVE && diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java index 80b1792240760..af91501229f82 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java @@ -519,7 +519,7 @@ public void done() { // Nothing to clean up here } }; - MoveAfterCopy moveAfterCopyWithLogging = (moves, fromDirectory, toDirectory) -> + MoveAfterCopy moveAfterCopyWithLogging = ( moves, fromDirectory, toDirectory ) -> { userLog.info( "Copied store from master to " + fromDirectory ); msgLog.info( "Starting post copy operation to move store from " + fromDirectory + " to " + storeDir ); diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/RequestContextFactory.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/RequestContextFactory.java index 617db526ebc30..317142df1f20c 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/RequestContextFactory.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/RequestContextFactory.java @@ -35,7 +35,7 @@ public class RequestContextFactory extends LifecycleAdapter public static final int DEFAULT_EVENT_IDENTIFIER = -1; - public RequestContextFactory( int serverId, Supplier txIdStoreSupplier) + public RequestContextFactory( int serverId, Supplier txIdStoreSupplier ) { this.txIdStoreSupplier = txIdStoreSupplier; this.epoch = -1; diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterImpl.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterImpl.java index 994b8653dad20..5d1432d250921 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterImpl.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterImpl.java @@ -193,9 +193,9 @@ public Response commit( RequestContext context, TransactionRepresentation conversationManager.release(context); } } - catch (NoSuchEntryException | ConcurrentAccessException e) + catch ( NoSuchEntryException | ConcurrentAccessException e ) { - throw new TransactionNotPresentOnMasterException(context); + throw new TransactionNotPresentOnMasterException( context ); } } } @@ -276,7 +276,8 @@ public Response newLockSession( RequestContext context ) throws Transactio if ( !spi.isAccessible() ) { - throw new TransactionFailureException(Status.General.DatabaseUnavailable, "Database is currently not available" ); + throw new TransactionFailureException( Status.General.DatabaseUnavailable, + "Database is currently not available" ); } assertCorrectEpoch( context ); @@ -315,11 +316,10 @@ public Response acquireExclusiveLock( RequestContext context, Resour { session = conversationManager.acquire( context ).getLocks(); } - catch ( NoSuchEntryException | ConcurrentAccessException e) + catch ( NoSuchEntryException | ConcurrentAccessException e ) { - return spi.packTransactionObligationResponse( context, new LockResult( - LockStatus.NOT_LOCKED, - "Unable to acquire exclusive lock: " + e.getMessage() ) ); + return spi.packTransactionObligationResponse( context, + new LockResult( LockStatus.NOT_LOCKED, "Unable to acquire exclusive lock: " + e.getMessage() ) ); } try { @@ -357,7 +357,7 @@ public Response acquireSharedLock( RequestContext context, ResourceT { session = conversationManager.acquire( context ).getLocks(); } - catch ( NoSuchEntryException | ConcurrentAccessException e) + catch ( NoSuchEntryException | ConcurrentAccessException e ) { return spi.packTransactionObligationResponse( context, new LockResult( LockStatus.NOT_LOCKED, diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/BranchedStoreBean.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/BranchedStoreBean.java index bd68622f530b6..9cc08623f3e2c 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/BranchedStoreBean.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/BranchedStoreBean.java @@ -39,8 +39,7 @@ import static org.neo4j.com.storecopy.StoreUtil.getBranchedDataRootDirectory; - -@Service.Implementation(ManagementBeanProvider.class) +@Service.Implementation( ManagementBeanProvider.class ) public final class BranchedStoreBean extends ManagementBeanProvider { public BranchedStoreBean() @@ -132,7 +131,7 @@ private BranchedStoreInfo parseBranchedStore( File branchDirectory ) } } - private PageCache getPageCache( ManagementData management) + private PageCache getPageCache( ManagementData management ) { return management.getKernelData().getPageCache(); } diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/ClusterDatabaseInfoProvider.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/ClusterDatabaseInfoProvider.java index aefd8925ad196..13ff3c7210427 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/ClusterDatabaseInfoProvider.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/ClusterDatabaseInfoProvider.java @@ -46,7 +46,7 @@ public ClusterDatabaseInfoProvider( ClusterMembers members, LastTxIdGetter txIdG public ClusterDatabaseInfo getInfo() { ClusterMember currentMember = members.getCurrentMember(); - if (currentMember == null) + if ( currentMember == null ) { return null; } diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/HighAvailabilityBean.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/HighAvailabilityBean.java index 0ede892af5faf..6dac21aaa9722 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/HighAvailabilityBean.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/HighAvailabilityBean.java @@ -31,7 +31,7 @@ import org.neo4j.management.ClusterMemberInfo; import org.neo4j.management.HighAvailability; -@Service.Implementation(ManagementBeanProvider.class) +@Service.Implementation( ManagementBeanProvider.class ) public final class HighAvailabilityBean extends ManagementBeanProvider { public HighAvailabilityBean() diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java b/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java index f635678777940..df7ea6cd314f9 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java @@ -260,7 +260,7 @@ public void leftCluster( InstanceId instanceId, URI member ) } finally { - if ( slave != null) + if ( slave != null ) { slave.shutdown(); } diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/correctness/ClusterState.java b/enterprise/ha/src/test/java/org/neo4j/ha/correctness/ClusterState.java index cd883ed445bcd..97b99ad559bd7 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/correctness/ClusterState.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/correctness/ClusterState.java @@ -64,33 +64,33 @@ public void addPendingActions( ClusterAction ... actions ) } /** All possible new cluster states that can be generated from this one. */ - public Iterator> transitions() + public Iterator> transitions() { final Iterator actions = pendingActions.iterator(); final Iterator instancesWithTimeouts = filter( HAS_TIMEOUTS, instances ).iterator(); - return new PrefetchingIterator>() + return new PrefetchingIterator>() { @Override - protected Pair fetchNextOrNull() + protected Pair fetchNextOrNull() { try { - if (actions.hasNext()) + if ( actions.hasNext() ) { ClusterAction action = actions.next(); return Pair.of( action, performAction( action ) ); } - else if (instancesWithTimeouts.hasNext()) + else if ( instancesWithTimeouts.hasNext() ) { ClusterInstance instance = instancesWithTimeouts.next(); - return performNextTimeoutFrom(instance); + return performNextTimeoutFrom( instance ); } else { return null; } } - catch (Exception e) + catch ( Exception e ) { throw new RuntimeException( e ); } @@ -139,12 +139,12 @@ public ClusterState snapshot() cloneInstances.add( clusterInstance.newCopy() ); } - return new ClusterState(cloneInstances, newPendingActions); + return new ClusterState( cloneInstances, newPendingActions ); } public ClusterInstance instance( String to ) throws URISyntaxException { - URI uri = new URI(to); + URI uri = new URI( to ); for ( ClusterInstance clusterInstance : instances ) { URI instanceUri = clusterInstance.uri(); diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/correctness/GraphVizExporter.java b/enterprise/ha/src/test/java/org/neo4j/ha/correctness/GraphVizExporter.java index 19cacb5e53f53..79ccaf273ce1e 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/correctness/GraphVizExporter.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/correctness/GraphVizExporter.java @@ -43,7 +43,7 @@ public GraphVizExporter( File target ) this.target = target; } - public void export(GraphDatabaseService db) throws IOException + public void export( GraphDatabaseService db ) throws IOException { FileOutputStream stream = new FileOutputStream( target ); PrintWriter out = new PrintWriter( stream ); diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/correctness/ProverTimeouts.java b/enterprise/ha/src/test/java/org/neo4j/ha/correctness/ProverTimeouts.java index ba29cb8f14882..52627e82540b8 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/correctness/ProverTimeouts.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/correctness/ProverTimeouts.java @@ -39,16 +39,16 @@ class ProverTimeouts extends Timeouts ProverTimeouts( URI to ) { - super(new FixedTimeoutStrategy(1)); + super( new FixedTimeoutStrategy( 1 ) ); this.to = to; timeouts = new LinkedHashMap<>(); } - private ProverTimeouts( URI to, Map> timeouts ) + private ProverTimeouts( URI to, Map> timeouts ) { super( new FixedTimeoutStrategy( 0 ) ); this.to = to; - this.timeouts = new LinkedHashMap<>(timeouts); + this.timeouts = new LinkedHashMap<>( timeouts ); } @Override @@ -99,7 +99,7 @@ public void tick( long time ) public ProverTimeouts snapshot() { - return new ProverTimeouts(to, timeouts); + return new ProverTimeouts( to, timeouts ); } @Override diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/correctness/TestProverTimeouts.java b/enterprise/ha/src/test/java/org/neo4j/ha/correctness/TestProverTimeouts.java index e86a7dc248a2e..1f02334209779 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/correctness/TestProverTimeouts.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/correctness/TestProverTimeouts.java @@ -19,9 +19,10 @@ */ package org.neo4j.ha.correctness; +import org.junit.Test; + import java.net.URI; -import org.junit.Test; import org.neo4j.cluster.com.message.Message; import org.neo4j.cluster.protocol.atomicbroadcast.multipaxos.ProposerMessage; @@ -34,8 +35,8 @@ public class TestProverTimeouts public void equalsShouldBeLogicalAndNotExact() throws Exception { // Given - ProverTimeouts timeouts1 = new ProverTimeouts( new URI("http://asd") ); - ProverTimeouts timeouts2 = new ProverTimeouts( new URI("http://asd") ); + ProverTimeouts timeouts1 = new ProverTimeouts( new URI( "http://asd" ) ); + ProverTimeouts timeouts2 = new ProverTimeouts( new URI( "http://asd" ) ); timeouts1.setTimeout( "a", Message.internal( ProposerMessage.join ) ); timeouts1.setTimeout( "b", Message.internal( ProposerMessage.join ) ); @@ -48,7 +49,7 @@ public void equalsShouldBeLogicalAndNotExact() throws Exception timeouts1.cancelTimeout( "a" ); // Then - assertEquals(timeouts1, timeouts2); + assertEquals( timeouts1, timeouts2 ); } } diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java b/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java index c849af378b49a..215f487fd4a82 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java @@ -67,7 +67,7 @@ import static org.neo4j.kernel.ha.HaSettings.ha_server; @Ignore( "Keep this test around as it's a very simple and 'close' test to quickly verify rolling upgrades" ) -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class RollingUpgradeIT { private static final int CLUSTER_SIZE = 3; @@ -290,7 +290,7 @@ private void rollOver( LegacyDatabase legacyDb, int i, int masterServerId, int a throws Exception { String storeDir = legacyDb.getStoreDir(); - if ( i == 0) + if ( i == 0 ) { storeDir += "new"; } diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java index 9dd7e3fcb660b..a7d78e698e044 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java @@ -213,7 +213,7 @@ public void populatingSchemaIndicesOnMasterShouldBeBroughtOnlineOnSlavesAfterSto // Check master IndexDefinition index; - try ( Transaction tx = master.beginTx()) + try ( Transaction tx = master.beginTx() ) { index = Iterables.single( master.schema().getIndexes() ); awaitIndexOnline( index, master, data ); @@ -268,7 +268,7 @@ public void onlineSchemaIndicesOnMasterShouldBeBroughtOnlineOnSlavesAfterStoreCo // And the population finishes dbFactory.triggerFinish( master ); IndexDefinition index; - try ( Transaction tx = master.beginTx()) + try ( Transaction tx = master.beginTx() ) { index = Iterables.single( master.schema().getIndexes() ); awaitIndexOnline( index, master, data ); @@ -302,10 +302,11 @@ private void proceedAsNormalWithIndexPopulationOnAllSlavesExcept( ControlledGrap } } - @SuppressWarnings("ResultOfMethodCallIgnored") - private ClusterManager.RepairKit bringSlaveOfflineAndRemoveStoreFiles( ManagedCluster cluster, HighlyAvailableGraphDatabase slave ) throws IOException + @SuppressWarnings( "ResultOfMethodCallIgnored" ) + private ClusterManager.RepairKit bringSlaveOfflineAndRemoveStoreFiles( ManagedCluster cluster, + HighlyAvailableGraphDatabase slave ) throws IOException { - ClusterManager.RepairKit slaveDown = cluster.shutdown(slave); + ClusterManager.RepairKit slaveDown = cluster.shutdown( slave ); File storeDir = new File( slave.getStoreDir() ); deleteRecursively( storeDir ); @@ -591,12 +592,12 @@ private static class ControlledGraphDatabaseFactory extends TestHighlyAvailableG ControlledGraphDatabaseFactory() { - factory = new ControllingIndexProviderFactory(perDbIndexProvider, Predicates.alwaysTrue()); + factory = new ControllingIndexProviderFactory( perDbIndexProvider, Predicates.alwaysTrue() ); } private ControlledGraphDatabaseFactory( Predicate dbsToControlIndexingOn ) { - factory = new ControllingIndexProviderFactory(perDbIndexProvider, dbsToControlIndexingOn); + factory = new ControllingIndexProviderFactory( perDbIndexProvider, dbsToControlIndexingOn ); } @Override diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterFailoverIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterFailoverIT.java index ed406a2f306c1..ff3f86faeecc2 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterFailoverIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterFailoverIT.java @@ -46,7 +46,7 @@ public class ClusterFailoverIT // parameters private int clusterSize; - @Parameters( name = "clusterSize:{0}") + @Parameters( name = "clusterSize:{0}" ) public static Collection data() { return Arrays.asList(new Object[][] { diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterTopologyChangesIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterTopologyChangesIT.java index 650708530366d..e330e4ee4ab7b 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterTopologyChangesIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterTopologyChangesIT.java @@ -67,7 +67,7 @@ public class ClusterTopologyChangesIT { @Rule - public final ClusterRule clusterRule = new ClusterRule(getClass()); + public final ClusterRule clusterRule = new ClusterRule( getClass() ); @Rule public final CleanupRule cleanup = new CleanupRule(); diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ConcurrentInstanceStartupIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ConcurrentInstanceStartupIT.java index 9cae58db99f5c..d8d79dd8c17be 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ConcurrentInstanceStartupIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ConcurrentInstanceStartupIT.java @@ -76,7 +76,7 @@ public void run() throw new RuntimeException( e ); } } - }); + } ); daThreads.add( t ); t.start(); } @@ -90,11 +90,11 @@ public void run() for ( HighlyAvailableGraphDatabase db : dbs ) { - if (db.isMaster()) + if ( db.isMaster() ) { - if (masterDone) + if ( masterDone ) { - throw new Exception("Two masters discovered"); + throw new Exception( "Two masters discovered" ); } masterDone = true; } diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/FailoverWithAdditionalSlaveFailuresIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/FailoverWithAdditionalSlaveFailuresIT.java index 35ee45d2cc7fa..0cc90ac43a2bf 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/FailoverWithAdditionalSlaveFailuresIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/FailoverWithAdditionalSlaveFailuresIT.java @@ -53,7 +53,7 @@ public class FailoverWithAdditionalSlaveFailuresIT private int clusterSize; private int[] slavesToFail; - @Parameters( name = "{index} clusterSize:{0}") + @Parameters( name = "{index} clusterSize:{0}" ) public static Collection data() { return Arrays.asList(new Object[][] { diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveTokenCreatorTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveTokenCreatorTest.java index baf907d23eda6..1b74d3c4b1872 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveTokenCreatorTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveTokenCreatorTest.java @@ -48,7 +48,7 @@ public interface SlaveTokenCreatorFixture Response callMasterMethod( Master master, RequestContext ctx, String name ); } - @Parameterized.Parameters(name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static Iterable tokenCreators() { SlaveTokenCreatorFixture slaveLabelTokenCreatorFixture = new SlaveTokenCreatorFixture() diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TxPushStrategyConfigIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TxPushStrategyConfigIT.java index 512cc61fcfadd..fc5eb48adaca5 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TxPushStrategyConfigIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TxPushStrategyConfigIT.java @@ -310,7 +310,7 @@ private static class LastTxMapping public void format( StringBuilder failures, long txId ) { - if ( txId < this.txId - this.missed || txId > this.txId) + if ( txId < this.txId - this.missed || txId > this.txId ) { if ( failures.length() > 0 ) { diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/WhenToInitializeTransactionOnMasterFromSlaveIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/WhenToInitializeTransactionOnMasterFromSlaveIT.java index b71795e380183..daa02fbe1fc1c 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/WhenToInitializeTransactionOnMasterFromSlaveIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/WhenToInitializeTransactionOnMasterFromSlaveIT.java @@ -46,7 +46,7 @@ public class WhenToInitializeTransactionOnMasterFromSlaveIT { @Rule - public ClusterRule clusterRule = new ClusterRule(getClass()); + public ClusterRule clusterRule = new ClusterRule( getClass() ); private GraphDatabaseService slave; private ClusterManager.ManagedCluster cluster; @@ -78,7 +78,7 @@ public void shouldNotInitializeTxOnReadOnlyOpsOnNeoXaDS() throws Exception { long nodeId = 0L; - try (Transaction transaction = slave.beginTx() ) + try ( Transaction transaction = slave.beginTx() ) { // When Node node = slave.getNodeById( nodeId ); @@ -87,7 +87,7 @@ public void shouldNotInitializeTxOnReadOnlyOpsOnNeoXaDS() throws Exception assertDidntStartMasterTx(); // When - count(node.getLabels()); + count( node.getLabels() ); // Then assertDidntStartMasterTx(); @@ -99,7 +99,7 @@ public void shouldNotInitializeTxOnReadOnlyOpsOnNeoXaDS() throws Exception assertDidntStartMasterTx(); // When - readEachProperty(node); + readEachProperty( node ); // Then assertDidntStartMasterTx(); diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberStateMachineTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberStateMachineTest.java index 638ede61723b6..e03f2bca7bbd8 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberStateMachineTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/HighAvailabilityMemberStateMachineTest.java @@ -710,25 +710,25 @@ public StateMachineBuilder withContext( HighAvailabilityMemberContext context ) return this; } - public StateMachineBuilder withEvents(ClusterMemberEvents events) + public StateMachineBuilder withEvents( ClusterMemberEvents events ) { this.events = events; return this; } - public StateMachineBuilder withClusterMembers(ObservedClusterMembers clusterMember) + public StateMachineBuilder withClusterMembers( ObservedClusterMembers clusterMember ) { this.clusterMembers = clusterMember; return this; } - public StateMachineBuilder withGuard(AvailabilityGuard guard) + public StateMachineBuilder withGuard( AvailabilityGuard guard ) { this.guard = guard; return this; } - public StateMachineBuilder withElection(Election election) + public StateMachineBuilder withElection( Election election ) { this.election = election; return this; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveBranchThenCopyTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveBranchThenCopyTest.java index 8cdb75afb149e..bdaebb55c9506 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveBranchThenCopyTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveBranchThenCopyTest.java @@ -175,7 +175,8 @@ public void shouldHandleBranchedStoreWhenMyStoreIdDiffersFromMasterStoreId() thr // When try { - switchToSlave.checkDataConsistency( masterClient, transactionIdStore, storeId, new URI("cluster://localhost?serverId=1"), me, CancellationRequest.NEVER_CANCELLED ); + switchToSlave.checkDataConsistency( masterClient, transactionIdStore, storeId, + new URI( "cluster://localhost?serverId=1" ), me, CancellationRequest.NEVER_CANCELLED ); fail( "Should have thrown " + MismatchingStoreIdException.class.getSimpleName() + " exception" ); } catch ( MismatchingStoreIdException e ) diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveCopyThenBranchTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveCopyThenBranchTest.java index 2559c4a3b5540..b6a789a68e54e 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveCopyThenBranchTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveCopyThenBranchTest.java @@ -179,7 +179,8 @@ public void shouldHandleBranchedStoreWhenMyStoreIdDiffersFromMasterStoreId() thr // When try { - switchToSlave.checkDataConsistency( masterClient, transactionIdStore, storeId, new URI("cluster://localhost?serverId=1"), me, CancellationRequest.NEVER_CANCELLED ); + switchToSlave.checkDataConsistency( masterClient, transactionIdStore, storeId, + new URI( "cluster://localhost?serverId=1" ), me, CancellationRequest.NEVER_CANCELLED ); fail( "Should have thrown " + MismatchingStoreIdException.class.getSimpleName() + " exception" ); } catch ( MismatchingStoreIdException e ) @@ -188,7 +189,8 @@ public void shouldHandleBranchedStoreWhenMyStoreIdDiffersFromMasterStoreId() thr } // Then - verify( switchToSlave ).stopServicesAndHandleBranchedStore( any( BranchedDataPolicy.class ), any(URI.class), any(URI.class), any(CancellationRequest.class) ); + verify( switchToSlave ).stopServicesAndHandleBranchedStore( any( BranchedDataPolicy.class ), any( URI.class ), + any( URI.class ), any( CancellationRequest.class ) ); } @Test @@ -264,7 +266,7 @@ public void shouldNotBranchStoreUnlessWeHaveCopiedDownAReplacement() throws Thro inOrder.verify( storeCopyClient ).copyStore( any( StoreCopyClient.StoreCopyRequester.class ), any( CancellationRequest.class ), any( MoveAfterCopy.class ) ) ; - inOrder.verify( branchPolicy ).handle( new File(""), pageCacheMock, NullLogService.getInstance() ); + inOrder.verify( branchPolicy ).handle( new File( "" ), pageCacheMock, NullLogService.getInstance() ); } @Test diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/member/ClusterMemberMatcher.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/member/ClusterMemberMatcher.java index 908645e58eca7..25ba5a576c2af 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/member/ClusterMemberMatcher.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/member/ClusterMemberMatcher.java @@ -50,7 +50,7 @@ public void describeTo( Description description ) description.appendText( Arrays.toString( expectedMembers ) ); } - public static Matcher sameMemberAs( final ClusterMember clusterMember) + public static Matcher sameMemberAs( final ClusterMember clusterMember ) { return new BaseMatcher() { diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/ConversationTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/ConversationTest.java index 94efc3003a7e3..51bf7e20b6a84 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/ConversationTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/ConversationTest.java @@ -72,7 +72,7 @@ public void stopCloseConversation() assertFalse( conversation.isActive() ); } - @Test(timeout = 3000) + @Test( timeout = 3000 ) public void conversationCanNotBeStoppedAndClosedConcurrently() throws InterruptedException { final CountDownLatch answerLatch = new CountDownLatch( 1 ); diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplTest.java index b46f896a01d73..bc34fc7b70460 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplTest.java @@ -19,16 +19,16 @@ */ package org.neo4j.kernel.ha.com.master; -import java.util.Collection; -import java.util.Map; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Future; - import org.junit.Rule; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; +import java.util.Collection; +import java.util.Map; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Future; + import org.neo4j.cluster.ClusterSettings; import org.neo4j.com.RequestContext; import org.neo4j.com.ResourceReleaser; @@ -346,7 +346,7 @@ public void shouldAllowStartNewTransactionAfterClientSessionWasRemovedOnTimeout( when( conversationSpi.acquireClient() ).thenReturn( client ); master.start(); HandshakeResult handshake = master.handshake( 1, newStoreIdForCurrentVersion() ).response(); - RequestContext requestContext = new RequestContext( handshake.epoch(), machineId, 0, 0, 0); + RequestContext requestContext = new RequestContext( handshake.epoch(), machineId, 0, 0, 0 ); // When master.newLockSession( requestContext ); diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/lock/ClusterLocksIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/lock/ClusterLocksIT.java index d2955229b199d..cf7f1e0047bec 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/lock/ClusterLocksIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/lock/ClusterLocksIT.java @@ -64,7 +64,7 @@ public void setUp() throws Exception { cluster = clusterRule .withSharedSetting( HaSettings.tx_push_factor, "2" ) - .withInstanceSetting( GraphDatabaseFacadeFactory.Configuration.lock_manager, (i) -> "community" ) + .withInstanceSetting( GraphDatabaseFacadeFactory.Configuration.lock_manager, ( i ) -> "community" ) .startCluster(); } @@ -118,7 +118,7 @@ public void oneOrTheOtherShouldDeadlock() throws Throwable { deadlockCount.incrementAndGet(); } - }); + } ); masterTx.start(); latch.await(); diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/impl/ha/ClusterManager.java b/enterprise/ha/src/test/java/org/neo4j/kernel/impl/ha/ClusterManager.java index 4e3738ab97682..29cb61c8031ed 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/impl/ha/ClusterManager.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/impl/ha/ClusterManager.java @@ -510,7 +510,7 @@ public static Predicate allAvailabilityGuardsReleased() return item -> { int clusterMembersChecked = 0; - for ( HighlyAvailableGraphDatabase member : item.getAllMembers()) + for ( HighlyAvailableGraphDatabase member : item.getAllMembers() ) { clusterMembersChecked++; try diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/EnterpriseBuiltInDbmsProcedures.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/EnterpriseBuiltInDbmsProcedures.java index 069d1417a4be3..3a1dbfd40a76d 100644 --- a/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/EnterpriseBuiltInDbmsProcedures.java +++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/EnterpriseBuiltInDbmsProcedures.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Set; @@ -161,11 +162,11 @@ public Stream terminateConnectionsForUser( @Name( "username" ) */ @Description( "List all user functions in the DBMS." ) - @Procedure(name = "dbms.functions", mode = DBMS) + @Procedure( name = "dbms.functions", mode = DBMS ) public Stream listFunctions() { return graph.getDependencyResolver().resolveDependency( Procedures.class ).getAllFunctions().stream() - .sorted( ( a, b ) -> a.name().toString().compareTo( b.name().toString() ) ) + .sorted( Comparator.comparing( a -> a.name().toString() ) ) .map( FunctionResult::new ); } @@ -192,7 +193,7 @@ public Stream listProcedures() { Procedures procedures = graph.getDependencyResolver().resolveDependency( Procedures.class ); return procedures.getAllProcedures().stream() - .sorted( ( a, b ) -> a.name().toString().compareTo( b.name().toString() ) ) + .sorted( Comparator.comparing( a -> a.name().toString() ) ) .map( ProcedureResult::new ); } diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/RelationshipRecordFormat.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/RelationshipRecordFormat.java index c7eaa2ac69dbd..4c7c6e27b99b9 100644 --- a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/RelationshipRecordFormat.java +++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/RelationshipRecordFormat.java @@ -112,7 +112,7 @@ public RelationshipRecord newRecord() protected void doReadInternal( RelationshipRecord record, PageCursor cursor, int recordSize, long headerByte, boolean inUse ) { - if (record.isUseFixedReferences()) + if ( record.isUseFixedReferences() ) { int type = cursor.getShort() & 0xFFFF; // read record in fixed reference format @@ -169,7 +169,7 @@ protected int requiredDataLength( RelationshipRecord record ) protected void doWriteInternal( RelationshipRecord record, PageCursor cursor ) throws IOException { - if (record.isUseFixedReferences()) + if ( record.isUseFixedReferences() ) { // write record in fixed reference format writeFixedReferencesRecord( record, cursor ); diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/v306/RelationshipRecordFormatV3_0_6.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/v306/RelationshipRecordFormatV3_0_6.java index 9df4838a7180e..a9ab8f057ab42 100644 --- a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/v306/RelationshipRecordFormatV3_0_6.java +++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/v306/RelationshipRecordFormatV3_0_6.java @@ -110,7 +110,7 @@ protected void doReadInternal( RelationshipRecord record, PageCursor cursor, int recordSize, long headerByte, boolean inUse ) { int type = cursor.getShort() & 0xFFFF; - if (record.isUseFixedReferences()) + if ( record.isUseFixedReferences() ) { // read record in fixed reference format readFixedReferencesRecord( record, cursor, headerByte, inUse, type ); @@ -164,7 +164,7 @@ protected void doWriteInternal( RelationshipRecord record, PageCursor cursor ) throws IOException { cursor.putShort( (short) record.getType() ); - if (record.isUseFixedReferences()) + if ( record.isUseFixedReferences() ) { // write record in fixed reference format writeFixedReferencesRecord( record, cursor ); diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/v310/RelationshipRecordFormatV3_1_0.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/v310/RelationshipRecordFormatV3_1_0.java index fbfbe0b423d8b..71e3a76e8f279 100644 --- a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/v310/RelationshipRecordFormatV3_1_0.java +++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/v310/RelationshipRecordFormatV3_1_0.java @@ -112,7 +112,7 @@ public RelationshipRecord newRecord() protected void doReadInternal( RelationshipRecord record, PageCursor cursor, int recordSize, long headerByte, boolean inUse ) { - if (record.isUseFixedReferences()) + if ( record.isUseFixedReferences() ) { int type = cursor.getShort() & 0xFFFF; // read record in fixed reference format @@ -169,7 +169,7 @@ protected int requiredDataLength( RelationshipRecord record ) protected void doWriteInternal( RelationshipRecord record, PageCursor cursor ) throws IOException { - if (record.isUseFixedReferences()) + if ( record.isUseFixedReferences() ) { // write record in fixed reference format writeFixedReferencesRecord( record, cursor ); diff --git a/enterprise/kernel/src/test/java/org/neo4j/graphdb/store/id/IdReuseTest.java b/enterprise/kernel/src/test/java/org/neo4j/graphdb/store/id/IdReuseTest.java index 640aa2c5863d4..249da2fc58ec8 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/graphdb/store/id/IdReuseTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/graphdb/store/id/IdReuseTest.java @@ -54,7 +54,7 @@ public void shouldReuseNodeIdsFromRolledBackTransaction() throws Exception { // Given GraphDatabaseService db = dbRule.getGraphDatabaseAPI(); - try (Transaction tx = db.beginTx()) + try ( Transaction tx = db.beginTx() ) { db.createNode(); @@ -65,7 +65,7 @@ public void shouldReuseNodeIdsFromRolledBackTransaction() throws Exception // When Node node; - try (Transaction tx = db.beginTx()) + try ( Transaction tx = db.beginTx() ) { node = db.createNode(); @@ -73,7 +73,7 @@ public void shouldReuseNodeIdsFromRolledBackTransaction() throws Exception } // Then - assertThat(node.getId(), equalTo(0L)); + assertThat( node.getId(), equalTo( 0L ) ); } @Test @@ -82,7 +82,7 @@ public void shouldReuseRelationshipIdsFromRolledBackTransaction() throws Excepti // Given GraphDatabaseService db = dbRule.getGraphDatabaseAPI(); Node node1, node2; - try (Transaction tx = db.beginTx()) + try ( Transaction tx = db.beginTx() ) { node1 = db.createNode(); node2 = db.createNode(); @@ -90,7 +90,7 @@ public void shouldReuseRelationshipIdsFromRolledBackTransaction() throws Excepti tx.success(); } - try (Transaction tx = db.beginTx()) + try ( Transaction tx = db.beginTx() ) { node1.createRelationshipTo( node2, RelationshipType.withName( "LIKE" ) ); @@ -101,17 +101,17 @@ public void shouldReuseRelationshipIdsFromRolledBackTransaction() throws Excepti // When Relationship relationship; - try (Transaction tx = db.beginTx()) + try ( Transaction tx = db.beginTx() ) { - node1 = db.getNodeById(node1.getId()); - node2 = db.getNodeById(node2.getId()); + node1 = db.getNodeById( node1.getId() ); + node2 = db.getNodeById( node2.getId() ); relationship = node1.createRelationshipTo( node2, RelationshipType.withName( "LIKE" ) ); tx.success(); } // Then - assertThat(relationship.getId(), equalTo(0L)); + assertThat( relationship.getId(), equalTo( 0L ) ); } @Test diff --git a/enterprise/kernel/src/test/java/org/neo4j/graphdb/store/id/RelationshipIdReuseStressIT.java b/enterprise/kernel/src/test/java/org/neo4j/graphdb/store/id/RelationshipIdReuseStressIT.java index 91ff52e927d82..e3c5973ac2fc9 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/graphdb/store/id/RelationshipIdReuseStressIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/graphdb/store/id/RelationshipIdReuseStressIT.java @@ -237,7 +237,7 @@ public void run() newRelationships += connectBandToCities( bandNode ); break; default: - throw new IllegalStateException("Unsupported direction value:" + direction); + throw new IllegalStateException( "Unsupported direction value:" + direction ); } transaction.success(); } @@ -381,7 +381,7 @@ public void run() } transaction.success(); } - catch ( DeadlockDetectedException | NotFoundException ignored) + catch ( DeadlockDetectedException | NotFoundException ignored ) { // ignore deadlocks } diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodePropertyExistenceConstraintCreationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodePropertyExistenceConstraintCreationIT.java index fa9123f63c176..0a38dfaf0bdcf 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodePropertyExistenceConstraintCreationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodePropertyExistenceConstraintCreationIT.java @@ -70,7 +70,7 @@ void createConstraintInRunningTx( GraphDatabaseService db, String label, String } @Override - NodeExistenceConstraintDescriptor newConstraintObject(LabelSchemaDescriptor descriptor ) + NodeExistenceConstraintDescriptor newConstraintObject( LabelSchemaDescriptor descriptor ) { return ConstraintDescriptorFactory.existsForSchema( descriptor ); } diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiLocksTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiLocksTest.java index fea5b92ae5888..3e1f4a69057b2 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiLocksTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiLocksTest.java @@ -30,7 +30,7 @@ public class ForsetiLocksTest extends LockingCompatibilityTestSuite { @Override - protected Locks createLockManager(Config config, Clock clock) + protected Locks createLockManager( Config config, Clock clock ) { return new ForsetiLockManager( config, clock, ResourceTypes.values() ); } diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/BaseHighLimitRecordFormatTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/BaseHighLimitRecordFormatTest.java index 8481c0ea1671d..97c0bedaea44e 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/BaseHighLimitRecordFormatTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/BaseHighLimitRecordFormatTest.java @@ -97,7 +97,7 @@ private class MyRecordFormat extends BaseHighLimitRecordFormat protected MyRecordFormat() { - super( (header) -> 4, 4 ); + super( ( header ) -> 4, 4 ); } @Override diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/PropertyRecordFormatTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/PropertyRecordFormatTest.java index b1ad130ad2b42..91627c15db579 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/PropertyRecordFormatTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/PropertyRecordFormatTest.java @@ -212,7 +212,7 @@ private void verifySameReferences( PropertyRecord recordA, PropertyRecord record assertEquals( recordA.getPrevProp(), recordB.getPrevProp() ); } - private void verifyDifferentReferences(PropertyRecord recordA, PropertyRecord recordB) + private void verifyDifferentReferences( PropertyRecord recordA, PropertyRecord recordB ) { assertNotEquals( recordA.getNextProp(), recordB.getNextProp() ); assertNotEquals( recordA.getPrevProp(), recordB.getPrevProp() ); diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreMigrationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreMigrationIT.java index 0d017de92f27b..9d4ea50fe3198 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreMigrationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreMigrationIT.java @@ -134,7 +134,7 @@ public static Iterable data() throws IOException return data; } - private static String baseDirName(RecordFormats toFormat, RecordFormats fromFormat) + private static String baseDirName( RecordFormats toFormat, RecordFormats fromFormat ) { return fromFormat.storeVersion() + toFormat.storeVersion(); } diff --git a/enterprise/management/src/main/java/org/neo4j/management/ClusterMemberInfo.java b/enterprise/management/src/main/java/org/neo4j/management/ClusterMemberInfo.java index 85576f62e3db8..ca78e86ad9ce5 100644 --- a/enterprise/management/src/main/java/org/neo4j/management/ClusterMemberInfo.java +++ b/enterprise/management/src/main/java/org/neo4j/management/ClusterMemberInfo.java @@ -101,9 +101,9 @@ public Pair connect() public Pair connect( String username, String password ) { URI address = null; - for (String uri : uris) + for ( String uri : uris ) { - if (uri.startsWith( "jmx" )) + if ( uri.startsWith( "jmx" ) ) { // address = uri; } diff --git a/enterprise/management/src/main/java/org/neo4j/management/Diagnostics.java b/enterprise/management/src/main/java/org/neo4j/management/Diagnostics.java index 0605d740014f4..881da3402dcd8 100644 --- a/enterprise/management/src/main/java/org/neo4j/management/Diagnostics.java +++ b/enterprise/management/src/main/java/org/neo4j/management/Diagnostics.java @@ -36,7 +36,7 @@ public interface Diagnostics @Description( "Dump diagnostics information for the diagnostics provider with the specified id." ) void dumpToLog( String providerId ); - @Description("Dump diagnostics information to JMX") + @Description( "Dump diagnostics information to JMX" ) String dumpAll( ); @Description( "Extract diagnostics information for the diagnostics provider with the specified id." ) diff --git a/enterprise/management/src/main/java/org/neo4j/management/IndexSamplingManager.java b/enterprise/management/src/main/java/org/neo4j/management/IndexSamplingManager.java index 91fb5290f3f70..d75eb85212fe5 100644 --- a/enterprise/management/src/main/java/org/neo4j/management/IndexSamplingManager.java +++ b/enterprise/management/src/main/java/org/neo4j/management/IndexSamplingManager.java @@ -28,8 +28,8 @@ public interface IndexSamplingManager { String NAME = "Index sampler"; - @Description("Trigger index sampling for the index associated with the provided label and property key." + + @Description( "Trigger index sampling for the index associated with the provided label and property key." + " If forceSample is set to true an index sampling will always happen otherwise a sampling is only " + - "done if the number of updates exceeds the configured dbms.index_sampling.update_percentage.") + "done if the number of updates exceeds the configured dbms.index_sampling.update_percentage." ) void triggerIndexSampling( String labelKey, String propertyKey, boolean forceSample ); } diff --git a/enterprise/management/src/main/java/org/neo4j/management/impl/HotspotManagementSupport.java b/enterprise/management/src/main/java/org/neo4j/management/impl/HotspotManagementSupport.java index f647a296d45af..db6710dc1cf16 100644 --- a/enterprise/management/src/main/java/org/neo4j/management/impl/HotspotManagementSupport.java +++ b/enterprise/management/src/main/java/org/neo4j/management/impl/HotspotManagementSupport.java @@ -39,8 +39,8 @@ import org.neo4j.helpers.Service; import org.neo4j.jmx.impl.ManagementSupport; -import org.neo4j.kernel.internal.KernelData; import org.neo4j.kernel.impl.logging.LogService; +import org.neo4j.kernel.internal.KernelData; import org.neo4j.logging.Log; import static org.neo4j.kernel.configuration.Settings.BOOLEAN; @@ -62,7 +62,7 @@ protected JMXServiceURL getJMXServiceURL( KernelData kernel ) try { Method importRemoteFrom = cal.getMethod( "importRemoteFrom", int.class ); - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Map remote = (Map) importRemoteFrom.invoke( null, 0 ); url = getUrlFrom( remote ); } diff --git a/enterprise/management/src/main/java/org/neo4j/management/impl/KernelProxy.java b/enterprise/management/src/main/java/org/neo4j/management/impl/KernelProxy.java index 229ab2b577175..e89cca79e9a4d 100644 --- a/enterprise/management/src/main/java/org/neo4j/management/impl/KernelProxy.java +++ b/enterprise/management/src/main/java/org/neo4j/management/impl/KernelProxy.java @@ -202,7 +202,7 @@ static ObjectName createObjectNameQuery( ObjectName query, Class beanInterfac private static ObjectName createObjectName( ObjectName query, String beanName, boolean isQuery ) { - Hashtable properties = new Hashtable(query.getKeyPropertyList()); + Hashtable properties = new Hashtable( query.getKeyPropertyList() ); return createObjectName( query.getDomain(), properties, beanName, isQuery ); } diff --git a/enterprise/management/src/main/java/org/neo4j/management/impl/LockManagerBean.java b/enterprise/management/src/main/java/org/neo4j/management/impl/LockManagerBean.java index f7810e4fe9e57..2c48ebd16683a 100644 --- a/enterprise/management/src/main/java/org/neo4j/management/impl/LockManagerBean.java +++ b/enterprise/management/src/main/java/org/neo4j/management/impl/LockManagerBean.java @@ -69,7 +69,7 @@ private Locks lockManager( ManagementData management ) return management.getKernelData().graphDatabase().getDependencyResolver() .resolveDependency( Locks.class ); } - catch (Throwable e) + catch ( Throwable e ) { e.printStackTrace(); return null; diff --git a/enterprise/management/src/main/java/org/neo4j/management/impl/PageCacheBean.java b/enterprise/management/src/main/java/org/neo4j/management/impl/PageCacheBean.java index 948fbec70e687..574503615e1ac 100644 --- a/enterprise/management/src/main/java/org/neo4j/management/impl/PageCacheBean.java +++ b/enterprise/management/src/main/java/org/neo4j/management/impl/PageCacheBean.java @@ -28,7 +28,7 @@ import org.neo4j.jmx.impl.Neo4jMBean; import org.neo4j.management.PageCache; -@Service.Implementation(ManagementBeanProvider.class) +@Service.Implementation( ManagementBeanProvider.class ) public final class PageCacheBean extends ManagementBeanProvider { public PageCacheBean() diff --git a/enterprise/management/src/main/java/org/neo4j/management/impl/TransactionManagerBean.java b/enterprise/management/src/main/java/org/neo4j/management/impl/TransactionManagerBean.java index 337f1bad02b43..63244b60f4162 100644 --- a/enterprise/management/src/main/java/org/neo4j/management/impl/TransactionManagerBean.java +++ b/enterprise/management/src/main/java/org/neo4j/management/impl/TransactionManagerBean.java @@ -31,7 +31,7 @@ import org.neo4j.kernel.impl.transaction.state.DataSourceManager; import org.neo4j.management.TransactionManager; -@Service.Implementation(ManagementBeanProvider.class) +@Service.Implementation( ManagementBeanProvider.class ) public final class TransactionManagerBean extends ManagementBeanProvider { public TransactionManagerBean() diff --git a/enterprise/management/src/test/java/org/neo4j/management/TestLockManagerBean.java b/enterprise/management/src/test/java/org/neo4j/management/TestLockManagerBean.java index 2a8a7360d2eff..0a354b15e9b36 100644 --- a/enterprise/management/src/test/java/org/neo4j/management/TestLockManagerBean.java +++ b/enterprise/management/src/test/java/org/neo4j/management/TestLockManagerBean.java @@ -41,7 +41,7 @@ public class TestLockManagerBean @Rule public ImpermanentDatabaseRule dbRule = new ImpermanentDatabaseRule(); - @SuppressWarnings("deprecation") + @SuppressWarnings( "deprecation" ) private GraphDatabaseAPI graphDb; @Before diff --git a/enterprise/management/src/test/java/org/neo4j/management/impl/IndexSamplingManagerBeanTest.java b/enterprise/management/src/test/java/org/neo4j/management/impl/IndexSamplingManagerBeanTest.java index 1155e6d648cea..d3f1f49c7de26 100644 --- a/enterprise/management/src/test/java/org/neo4j/management/impl/IndexSamplingManagerBeanTest.java +++ b/enterprise/management/src/test/java/org/neo4j/management/impl/IndexSamplingManagerBeanTest.java @@ -96,7 +96,7 @@ public void forceSamplingTriggeredWhenIdsArePresent() throws IndexNotFoundKernel IndexSamplingMode.TRIGGER_REBUILD_ALL); } - @Test(expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void exceptionThrownWhenMissingLabel() { // Given @@ -107,7 +107,7 @@ public void exceptionThrownWhenMissingLabel() storeAccess.triggerIndexSampling( NON_EXISTING_LABEL, EXISTING_PROPERTY, false ); } - @Test(expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void exceptionThrownWhenMissingProperty() { // Given @@ -118,7 +118,7 @@ public void exceptionThrownWhenMissingProperty() storeAccess.triggerIndexSampling( EXISTING_LABEL, NON_EXISTING_PROPERTY, false ); } - @Test(expected = IllegalArgumentException.class) + @Test( expected = IllegalArgumentException.class ) public void exceptionThrownWhenNotRegistered() { // Given diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/causalclustering/CatchUpMetrics.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/causalclustering/CatchUpMetrics.java index e7af5b414e09c..6ecac52fa1f26 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/causalclustering/CatchUpMetrics.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/causalclustering/CatchUpMetrics.java @@ -19,25 +19,23 @@ */ package org.neo4j.metrics.source.causalclustering; -import java.io.IOException; -import java.util.function.Supplier; - import com.codahale.metrics.Gauge; import com.codahale.metrics.MetricRegistry; -import org.neo4j.causalclustering.core.consensus.CoreMetaData; +import java.io.IOException; + import org.neo4j.kernel.impl.annotations.Documented; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.kernel.monitoring.Monitors; import static com.codahale.metrics.MetricRegistry.name; -@Documented(".CatchUp Metrics") +@Documented( ".CatchUp Metrics" ) public class CatchUpMetrics extends LifecycleAdapter { private static final String CAUSAL_CLUSTERING_PREFIX = "neo4j.causal_clustering.catchup"; - @Documented("TX pull requests received from read replicas") + @Documented( "TX pull requests received from read replicas" ) public static final String TX_PULL_REQUESTS_RECEIVED = name( CAUSAL_CLUSTERING_PREFIX, "tx_pull_requests_received" ); private Monitors monitors; diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/causalclustering/CoreMetrics.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/causalclustering/CoreMetrics.java index 6444e037c88f1..c12b873b3ef26 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/causalclustering/CoreMetrics.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/causalclustering/CoreMetrics.java @@ -32,26 +32,26 @@ import static com.codahale.metrics.MetricRegistry.name; -@Documented(".Core Metrics") +@Documented( ".Core Metrics" ) public class CoreMetrics extends LifecycleAdapter { private static final String CAUSAL_CLUSTERING_PREFIX = "neo4j.causal_clustering.core"; - @Documented("Append index of the RAFT log") + @Documented( "Append index of the RAFT log" ) public static final String APPEND_INDEX = name( CAUSAL_CLUSTERING_PREFIX, "append_index" ); - @Documented("Commit index of the RAFT log") + @Documented( "Commit index of the RAFT log" ) public static final String COMMIT_INDEX = name( CAUSAL_CLUSTERING_PREFIX, "commit_index" ); - @Documented("RAFT Term of this server") + @Documented( "RAFT Term of this server" ) public static final String TERM = name( CAUSAL_CLUSTERING_PREFIX, "term" ); - @Documented("Leader was not found while attempting to commit a transaction") + @Documented( "Leader was not found while attempting to commit a transaction" ) public static final String LEADER_NOT_FOUND = name( CAUSAL_CLUSTERING_PREFIX, "leader_not_found" ); - @Documented("Transaction retries") + @Documented( "Transaction retries" ) public static final String TX_RETRIES = name( CAUSAL_CLUSTERING_PREFIX, "tx_retries" ); - @Documented("Is this server the leader?") + @Documented( "Is this server the leader?" ) public static final String IS_LEADER = name( CAUSAL_CLUSTERING_PREFIX, "is_leader" ); - @Documented("How many RAFT messages were dropped?") + @Documented( "How many RAFT messages were dropped?" ) public static final String DROPPED_MESSAGES = name( CAUSAL_CLUSTERING_PREFIX, "dropped_messages" ); - @Documented("How many RAFT messages are queued up?") + @Documented( "How many RAFT messages are queued up?" ) public static final String QUEUE_SIZE = name( CAUSAL_CLUSTERING_PREFIX, "queue_sizes" ); private Monitors monitors; diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/causalclustering/ReadReplicaMetrics.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/causalclustering/ReadReplicaMetrics.java index bd2fca5fb3470..441a854d7015a 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/causalclustering/ReadReplicaMetrics.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/causalclustering/ReadReplicaMetrics.java @@ -30,7 +30,7 @@ import static com.codahale.metrics.MetricRegistry.name; -@Documented(".Read Replica Metrics") +@Documented( ".Read Replica Metrics" ) public class ReadReplicaMetrics extends LifecycleAdapter { private static final String CAUSAL_CLUSTERING_PREFIX = "neo4j.causal_clustering.read_replica"; diff --git a/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsTestHelper.java b/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsTestHelper.java index 57a37773b0aed..8040c61eb5533 100644 --- a/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsTestHelper.java +++ b/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsTestHelper.java @@ -38,7 +38,7 @@ public class MetricsTestHelper public static long readLongValue( File metricFile ) throws IOException, InterruptedException { - return readLongValueAndAssert( metricFile, (one, two) -> true ); + return readLongValueAndAssert( metricFile, ( one, two ) -> true ); } public static long readLongValueAndAssert( File metricFile, BiPredicate assumption ) diff --git a/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/EnterpriseTestServerBuilders.java b/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/EnterpriseTestServerBuilders.java index 85f67fb01c177..589d713044aac 100644 --- a/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/EnterpriseTestServerBuilders.java +++ b/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/EnterpriseTestServerBuilders.java @@ -40,7 +40,7 @@ public static TestServerBuilder newInProcessBuilder() /** * Create a builder capable of starting an in-process Neo4j instance, running in a subdirectory of the specified directory. */ - public static TestServerBuilder newInProcessBuilder(File workingDirectory) + public static TestServerBuilder newInProcessBuilder( File workingDirectory ) { return new EnterpriseInProcessServerBuilder( workingDirectory ); } diff --git a/enterprise/neo4j-harness-enterprise/src/test/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilderTest.java b/enterprise/neo4j-harness-enterprise/src/test/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilderTest.java index 4f4ca6bfeb721..962aee59378e3 100644 --- a/enterprise/neo4j-harness-enterprise/src/test/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilderTest.java +++ b/enterprise/neo4j-harness-enterprise/src/test/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilderTest.java @@ -49,15 +49,15 @@ public class EnterpriseInProcessServerBuilderTest public void shouldLaunchAServerInSpecifiedDirectory() throws Exception { // Given - File workDir = new File(testDir.directory(), "specific"); + File workDir = new File( testDir.directory(), "specific" ); workDir.mkdir(); // When - try (ServerControls server = getTestServerBuilder( workDir ).newServer()) + try ( ServerControls server = getTestServerBuilder( workDir ).newServer() ) { // Then assertThat( HTTP.GET( server.httpURI().toString() ).status(), equalTo( 200 ) ); - assertThat( workDir.list().length, equalTo(1)); + assertThat( workDir.list().length, equalTo( 1 ) ); } // And after it's been closed, it should've cleaned up after itself. diff --git a/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/QueryLoggerKernelExtension.java b/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/QueryLoggerKernelExtension.java index 182b08bc6e729..831043f89e7ff 100644 --- a/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/QueryLoggerKernelExtension.java +++ b/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/QueryLoggerKernelExtension.java @@ -39,7 +39,6 @@ import org.neo4j.logging.Log; import org.neo4j.logging.RotatingFileOutputStreamSupplier; -import static java.lang.String.format; import static org.neo4j.io.file.Files.createOrOpenAsOuputStream; @Service.Implementation( KernelExtensionFactory.class ) @@ -74,7 +73,7 @@ public Lifecycle newInstance( @SuppressWarnings( "unused" ) KernelContext contex final JobScheduler jobScheduler = dependencies.jobScheduler(); final Monitors monitoring = dependencies.monitoring(); - if (!queryLogEnabled) + if ( !queryLogEnabled ) { return createEmptyAdapter(); } @@ -92,7 +91,7 @@ public void init() throws Throwable EnumSet flags = EnumSet.noneOf( QueryLogEntryContent.class ); for ( QueryLogEntryContent flag : QueryLogEntryContent.values() ) { - if (flag.enabledIn(config)) + if ( flag.enabledIn( config ) ) { flags.add( flag ); } @@ -100,7 +99,7 @@ public void init() throws Throwable FormattedLog.Builder logBuilder = FormattedLog.withUTCTimeZone(); Log log; - if (rotationThreshold == 0) + if ( rotationThreshold == 0 ) { OutputStream logOutputStream = createOrOpenAsOuputStream( fileSystem, queryLogFile, true ); log = logBuilder.toOutputStream( logOutputStream ); diff --git a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java index 30d6baf3b04b7..cc04db737b527 100644 --- a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java +++ b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java @@ -19,6 +19,11 @@ */ package org.neo4j.kernel.impl.query; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; @@ -35,11 +40,6 @@ import java.util.Map; import java.util.stream.Collectors; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.ResourceIterator; import org.neo4j.graphdb.Result; @@ -154,7 +154,7 @@ public void shouldLogTXMetaDataInQueryLog() throws Throwable ResourceIterator::close ); // Set meta data and execute query in transaction - try (InternalTransaction tx = db.beginLocalTransactionAsUser( subject, KernelTransaction.Type.explicit )) + try ( InternalTransaction tx = db.beginLocalTransactionAsUser( subject, KernelTransaction.Type.explicit ) ) { graph.execute( "CALL dbms.setTXMetaData( { User: 'Johan' } )", Collections.emptyMap() ); graph.execute( "CALL dbms.procedures() YIELD name RETURN name", Collections.emptyMap() ).close(); @@ -164,7 +164,7 @@ public void shouldLogTXMetaDataInQueryLog() throws Throwable } // Ensure that old meta data is not retained - try (InternalTransaction tx = db.beginLocalTransactionAsUser( subject, KernelTransaction.Type.explicit )) + try ( InternalTransaction tx = db.beginLocalTransactionAsUser( subject, KernelTransaction.Type.explicit ) ) { graph.execute( "CALL dbms.setTXMetaData( { Location: 'Sweden' } )", Collections.emptyMap() ); graph.execute( "MATCH ()-[r]-() RETURN count(r)", Collections.emptyMap() ).close(); diff --git a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealm.java b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealm.java index 2b3d66a37048d..9f2d302c5ffb7 100644 --- a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealm.java +++ b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealm.java @@ -91,7 +91,7 @@ public class InternalFlatFileRealm extends AuthorizingRealm implements RealmLife public InternalFlatFileRealm( UserRepository userRepository, RoleRepository roleRepository, PasswordPolicy passwordPolicy, AuthenticationStrategy authenticationStrategy, JobScheduler jobScheduler, UserRepository initialUserRepository, - UserRepository defaultAdminRepository) + UserRepository defaultAdminRepository ) { this( userRepository, roleRepository, passwordPolicy, authenticationStrategy, true, true, jobScheduler, initialUserRepository, defaultAdminRepository ); @@ -222,7 +222,7 @@ private Set ensureDefaultUsers() throws Throwable if ( initialUserRepository.numberOfUsers() > 0 ) { User initUser = initialUserRepository.getUserByName( INITIAL_USER_NAME ); - if (initUser != null) + if ( initUser != null ) { userRepository.update( neo4j, initUser ); } diff --git a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/ShiroAuthToken.java b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/ShiroAuthToken.java index d6be8d26ac4f1..7b4a2110acdce 100644 --- a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/ShiroAuthToken.java +++ b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/ShiroAuthToken.java @@ -87,7 +87,7 @@ public String toString() return "{}"; } - List keys = new ArrayList<>(authToken.keySet()); + List keys = new ArrayList<>( authToken.keySet() ); int schemeIndex = keys.indexOf( AuthToken.SCHEME_KEY ); if ( schemeIndex > 0 ) { diff --git a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/ShiroAuthenticationInfo.java b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/ShiroAuthenticationInfo.java index dd99e6aec889f..6f02f1d09b6f2 100644 --- a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/ShiroAuthenticationInfo.java +++ b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/ShiroAuthenticationInfo.java @@ -61,7 +61,7 @@ public AuthenticationResult getAuthenticationResult() @Override public void merge( AuthenticationInfo info ) { - if (info == null || info.getPrincipals() == null || info.getPrincipals().isEmpty()) + if ( info == null || info.getPrincipals() == null || info.getPrincipals().isEmpty() ) { return; } diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltInteraction.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltInteraction.java index 5180e054796ea..36ab6e7c4c978 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltInteraction.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltInteraction.java @@ -77,9 +77,9 @@ class BoltInteraction implements NeoInteractionLevel config ) throws IOException + BoltInteraction( Map config ) throws IOException { - this(config, EphemeralFileSystemAbstraction::new); + this( config, EphemeralFileSystemAbstraction::new ); } BoltInteraction( Map config, Supplier fileSystemSupplier ) throws IOException @@ -143,7 +143,7 @@ public String executeQuery( BoltSubject subject, String call, Map resultConsumer.accept( collectResults( subject.client ) ); return ""; } - catch (Exception e) + catch ( Exception e ) { return e.getMessage(); } diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BuiltInProceduresInteractionTestBase.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BuiltInProceduresInteractionTestBase.java index 6d8782675b2a4..d30a5065b2a4f 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BuiltInProceduresInteractionTestBase.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BuiltInProceduresInteractionTestBase.java @@ -494,7 +494,7 @@ public void shouldFailToTerminateOtherUsersQuery() throws Throwable read.closeAndAssertSuccess(); write.closeAndAssertSuccess(); } - catch (Throwable t) + catch ( Throwable t ) { latch.finishAndWaitForAllToFinish(); throw t; diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedInteraction.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedInteraction.java index 87e257f522350..8a5474bd4d38c 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedInteraction.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedInteraction.java @@ -52,7 +52,7 @@ public class EmbeddedInteraction implements NeoInteractionLevel config ) throws Throwable { - this (config, EphemeralFileSystemAbstraction::new); + this( config, EphemeralFileSystemAbstraction::new ); } EmbeddedInteraction( Map config, Supplier fileSystemSupplier ) throws Throwable diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/FileRoleRepositoryTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/FileRoleRepositoryTest.java index 85633f6db53a8..571e1a872839f 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/FileRoleRepositoryTest.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/FileRoleRepositoryTest.java @@ -63,7 +63,7 @@ import static org.junit.Assert.fail; import static org.neo4j.test.assertion.Assert.assertException; -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class FileRoleRepositoryTest { private File roleFile = new File( "dbms", "roles" ); @@ -71,7 +71,7 @@ public class FileRoleRepositoryTest private FileSystemAbstraction fs; private RoleRepository roleRepository; - @Parameterized.Parameters(name = "{1} filesystem") + @Parameterized.Parameters( name = "{1} filesystem" ) public static Collection data() { return Arrays.asList( new Object[][]{ diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealmIT.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealmIT.java index 18739b858c52b..9786029d9a141 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealmIT.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealmIT.java @@ -180,7 +180,7 @@ public void shouldEventuallyFailReloadAttempts() throws Exception { assertThat( e.getMessage(), containsString( "Unable to load valid flat file repositories! Attempts failed with:" ) ); - File authFile = new File("dbms/auth"); + File authFile = new File( "dbms/auth" ); assertThat( e.getMessage(), containsString( "Failed to read authentication file: " + authFile ) ); assertThat( e.getMessage(), containsString( "Role-auth file combination not valid" ) ); } diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/LdapCachingTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/LdapCachingTest.java index b2c8f4c4366a9..2321dd71b39ac 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/LdapCachingTest.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/LdapCachingTest.java @@ -82,7 +82,7 @@ public void setup() throws Throwable fakeTicker = new FakeTicker(); authManager = new MultiRealmAuthManager( internalFlatFileRealm, realms, - new ShiroCaffeineCache.Manager( fakeTicker::read, 100, 10), securityLog, false ); + new ShiroCaffeineCache.Manager( fakeTicker::read, 100, 10 ), securityLog, false ); authManager.init(); authManager.start(); diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/MultiRealmAuthManagerTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/MultiRealmAuthManagerTest.java index 8491392c3bc28..5b151723cab87 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/MultiRealmAuthManagerTest.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/MultiRealmAuthManagerTest.java @@ -34,19 +34,19 @@ import org.neo4j.kernel.api.security.AuthSubject; import org.neo4j.kernel.api.security.AuthToken; import org.neo4j.kernel.api.security.AuthenticationResult; +import org.neo4j.kernel.api.security.PasswordPolicy; import org.neo4j.kernel.api.security.SecurityContext; import org.neo4j.kernel.api.security.exception.InvalidAuthTokenException; import org.neo4j.kernel.configuration.Config; +import org.neo4j.kernel.impl.security.Credential; +import org.neo4j.kernel.impl.security.User; import org.neo4j.kernel.impl.util.JobScheduler; import org.neo4j.logging.AssertableLogProvider; import org.neo4j.logging.Log; import org.neo4j.logging.NullLogProvider; import org.neo4j.server.security.auth.AuthenticationStrategy; import org.neo4j.server.security.auth.CommunitySecurityModule; -import org.neo4j.kernel.impl.security.Credential; import org.neo4j.server.security.auth.InitialUserTest; -import org.neo4j.kernel.api.security.PasswordPolicy; -import org.neo4j.kernel.impl.security.User; import org.neo4j.server.security.auth.UserRepository; import org.neo4j.server.security.enterprise.auth.plugin.api.PredefinedRoles; import org.neo4j.server.security.enterprise.log.SecurityLog; @@ -171,10 +171,7 @@ public void shouldFailIfNoRolesFileButManyUsersAndNonExistingDefaultAdmin() thro EnterpriseSecurityModule.getDefaultAdminRepository( config, NullLogProvider.getInstance(), fsRule.get() ); defaultAdminRepository.start(); defaultAdminRepository.create( - new User.Builder( "foo", Credential.INACCESSIBLE) - .withRequiredPasswordChange( false ) - .build() - ); + new User.Builder( "foo", Credential.INACCESSIBLE ).withRequiredPasswordChange( false ).build() ); defaultAdminRepository.shutdown(); users.create( newUser( "jake", "abc123" , false ) ); diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/NeoInteractionLevel.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/NeoInteractionLevel.java index a033becad850e..534c6edd5a157 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/NeoInteractionLevel.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/NeoInteractionLevel.java @@ -57,7 +57,7 @@ String executeQuery( S subject, String call, Map params, void tearDown() throws Throwable; - static String tempPath(String prefix, String suffix ) throws IOException + static String tempPath( String prefix, String suffix ) throws IOException { Path path = Files.createTempFile( prefix, suffix ); Files.delete( path ); diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ProcedureInteractionTestBase.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ProcedureInteractionTestBase.java index 20d6f84b8a286..129d5b5e164bb 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ProcedureInteractionTestBase.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ProcedureInteractionTestBase.java @@ -360,7 +360,7 @@ void testSuccessfulTestProcs( S subject ) void assertPasswordChangeWhenPasswordChangeRequired( S subject, String newPassword ) { - StringBuilder builder = new StringBuilder(128); + StringBuilder builder = new StringBuilder( 128 ); S subjectToUse; // remove if-else ASAP @@ -573,7 +573,7 @@ public static class ClassWithProcedures @Context public TerminationGuard guard; - @Procedure(name = "test.loop") + @Procedure( name = "test.loop" ) public void loop() { DoubleLatch latch = volatileLatch; diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ThreadedTransaction.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ThreadedTransaction.java index 660c5b003609c..3e1cf3dd9c4f5 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ThreadedTransaction.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ThreadedTransaction.java @@ -118,7 +118,7 @@ public Throwable apply( S subject ) tx.success(); return null; } - catch (Throwable t) + catch ( Throwable t ) { return t; } diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ThreadedTransactionPeriodicCommit.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ThreadedTransactionPeriodicCommit.java index 497c034af9595..e787f47b079e7 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ThreadedTransactionPeriodicCommit.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ThreadedTransactionPeriodicCommit.java @@ -50,8 +50,7 @@ public class ThreadedTransactionPeriodicCommit void execute( ThreadingRule threading, S subject, int nLines ) { - NamedFunction servCsv = - new NamedFunction("serv-csv") + NamedFunction servCsv = new NamedFunction( "serv-csv" ) { @Override public Throwable apply( Integer n ) throws RuntimeException @@ -109,7 +108,7 @@ public String apply( S subject ) null, r -> {} ); } - catch (Throwable t) + catch ( Throwable t ) { return t.getMessage(); } diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/integration/bolt/BoltConnectionManagementIT.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/integration/bolt/BoltConnectionManagementIT.java index 2f430e2f89734..7ce54e583fb9b 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/integration/bolt/BoltConnectionManagementIT.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/integration/bolt/BoltConnectionManagementIT.java @@ -24,8 +24,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import java.io.IOException; @@ -355,7 +353,7 @@ private void authenticate( TransportConnection client, String username, String p Map authToken = map( "principal", username, "credentials", password, "scheme", "basic" ); - if ( newPassword != null) + if ( newPassword != null ) { authToken.put( "new_credentials", newPassword ); } diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterBootstrapper.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterBootstrapper.java index 30bd70af8418f..7c8dcd50e16ec 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterBootstrapper.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterBootstrapper.java @@ -77,7 +77,7 @@ public final int start( File homeDir, Optional configFile, PairinstanceOf( LifecycleException.class ) ); if ( cause instanceof ChannelException ) { @@ -113,7 +113,7 @@ public void close() private static Config getConfig( Optional configFile, Pair... configOverrides ) { Map config = new HashMap<>(); - configFile.ifPresent( (file) -> + configFile.ifPresent( ( file ) -> { try { diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseServerSettings.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseServerSettings.java index 0742631636ab6..95ef2229b0fdf 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseServerSettings.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseServerSettings.java @@ -29,23 +29,23 @@ import static org.neo4j.kernel.configuration.Settings.TRUE; import static org.neo4j.kernel.configuration.Settings.setting; -@Description("Settings available in the Enterprise server") +@Description( "Settings available in the Enterprise server" ) public class EnterpriseServerSettings implements LoadableConfig { - @SuppressWarnings("unused") // accessed from the browser + @SuppressWarnings( "unused" ) // accessed from the browser @Description( "Configure the Neo4j Browser to time out logged in users after this idle period. " + "Setting this to 0 indicates no limit." ) public static final Setting browser_credentialTimeout = setting( "browser.credential_timeout", DURATION, "0" ); - @SuppressWarnings("unused") // accessed from the browser + @SuppressWarnings( "unused" ) // accessed from the browser @Description( "Configure the Neo4j Browser to store or not store user credentials." ) public static final Setting browser_retainConnectionCredentials = setting( "browser.retain_connection_credentials", BOOLEAN, TRUE ); - @SuppressWarnings("unused") // accessed from the browser + @SuppressWarnings( "unused" ) // accessed from the browser @Description( "Whitelist of hosts for the Neo4j Browser to be allowed to fetch content from." ) public static final Setting browser_remoteContentHostnameWhitelist = setting( "browser.remote_content_hostname_whitelist", STRING, "http://guides.neo4j.com,https://guides.neo4j.com,http://localhost,https://localhost" ); - @SuppressWarnings("unused") // accessed from the browser + @SuppressWarnings( "unused" ) // accessed from the browser @Description( "Configure the policy for outgoing Neo4j Browser connections." ) public static final Setting browser_allowOutgoingBrowserConnections = setting( "browser.allow_outgoing_connections", BOOLEAN, TRUE ); } diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityService.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityService.java index 7daadd9c7ebe4..1abfcae43fab8 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityService.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityService.java @@ -37,7 +37,7 @@ import static javax.ws.rs.core.Response.Status.OK; import static javax.ws.rs.core.Response.status; -@Path(CoreDatabaseAvailabilityService.BASE_PATH) +@Path( CoreDatabaseAvailabilityService.BASE_PATH ) public class CoreDatabaseAvailabilityService implements AdvertisableService { public static final String BASE_PATH = "server/core"; @@ -73,7 +73,7 @@ public Response discover() throws BadInputException } @GET - @Path(IS_WRITABLE_PATH) + @Path( IS_WRITABLE_PATH ) public Response isWritable() throws BadInputException { if ( coreDatabase == null ) @@ -90,7 +90,7 @@ public Response isWritable() throws BadInputException } @GET - @Path(IS_READ_ONLY_PATH) + @Path( IS_READ_ONLY_PATH ) public Response isReadOnly() throws BadInputException { if ( coreDatabase == null ) diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/MasterInfoService.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/MasterInfoService.java index 5c1bb18dc5718..3a3efd3bce53b 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/MasterInfoService.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/MasterInfoService.java @@ -31,12 +31,12 @@ import org.neo4j.server.rest.repr.OutputFormat; import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; -import static javax.ws.rs.core.Response.status; import static javax.ws.rs.core.Response.Status.FORBIDDEN; import static javax.ws.rs.core.Response.Status.NOT_FOUND; import static javax.ws.rs.core.Response.Status.OK; +import static javax.ws.rs.core.Response.status; -@Path(MasterInfoService.BASE_PATH) +@Path( MasterInfoService.BASE_PATH ) public class MasterInfoService implements AdvertisableService { public static final String BASE_PATH = "server/ha"; @@ -76,7 +76,7 @@ public Response discover() throws BadInputException } @GET - @Path(IS_MASTER_PATH) + @Path( IS_MASTER_PATH ) public Response isMaster() throws BadInputException { if ( haDb == null ) @@ -85,12 +85,12 @@ public Response isMaster() throws BadInputException } String role = haDb.role().toLowerCase(); - if ( role.equals( "master" )) + if ( role.equals( "master" ) ) { return positiveResponse(); } - if ( role.equals( "slave" )) + if ( role.equals( "slave" ) ) { return negativeResponse(); } @@ -99,7 +99,7 @@ public Response isMaster() throws BadInputException } @GET - @Path(IS_SLAVE_PATH) + @Path( IS_SLAVE_PATH ) public Response isSlave() throws BadInputException { if ( haDb == null ) @@ -108,12 +108,12 @@ public Response isSlave() throws BadInputException } String role = haDb.role().toLowerCase(); - if ( role.equals( "slave" )) + if ( role.equals( "slave" ) ) { return positiveResponse(); } - if ( role.equals( "master" )) + if ( role.equals( "master" ) ) { return negativeResponse(); } @@ -131,7 +131,7 @@ public Response isAvailable() } String role = haDb.role().toLowerCase(); - if ( "slave".equals( role ) || "master".equals( role )) + if ( "slave".equals( role ) || "master".equals( role ) ) { return plainTextResponse( OK, role ); } diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/ReadReplicaDatabaseAvailabilityService.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/ReadReplicaDatabaseAvailabilityService.java index a56c71a6f22d8..8ffc51627168f 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/ReadReplicaDatabaseAvailabilityService.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/ReadReplicaDatabaseAvailabilityService.java @@ -31,11 +31,10 @@ import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; import static javax.ws.rs.core.Response.Status.FORBIDDEN; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; import static javax.ws.rs.core.Response.Status.OK; import static javax.ws.rs.core.Response.status; -@Path( ReadReplicaDatabaseAvailabilityService.BASE_PATH) +@Path( ReadReplicaDatabaseAvailabilityService.BASE_PATH ) public class ReadReplicaDatabaseAvailabilityService implements AdvertisableService { static final String BASE_PATH = "server/read-replica"; diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/NeoServerRestartTestEnterprise.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/NeoServerRestartTestEnterprise.java index 242fe9c10fe8f..d1e93dfb22950 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/NeoServerRestartTestEnterprise.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/NeoServerRestartTestEnterprise.java @@ -29,10 +29,10 @@ public class NeoServerRestartTestEnterprise extends NeoServerRestartTest { - protected NeoServer getNeoServer( String customPageSwapperName) throws IOException + protected NeoServer getNeoServer( String customPageSwapperName ) throws IOException { - CommunityServerBuilder builder = EnterpriseServerBuilder.server().withProperty( GraphDatabaseSettings - .pagecache_swapper.name(), customPageSwapperName ); + CommunityServerBuilder builder = EnterpriseServerBuilder.server() + .withProperty( GraphDatabaseSettings.pagecache_swapper.name(), customPageSwapperName ); return builder.build(); } } diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/functional/DumpPortListenerOnNettyBindFailure.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/functional/DumpPortListenerOnNettyBindFailure.java index 18e1fa723963a..a5e2a287b83f5 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/functional/DumpPortListenerOnNettyBindFailure.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/functional/DumpPortListenerOnNettyBindFailure.java @@ -39,7 +39,7 @@ public class DumpPortListenerOnNettyBindFailure implements TestRule public DumpPortListenerOnNettyBindFailure() { - this(System.err); + this( System.err ); } public DumpPortListenerOnNettyBindFailure( OutputStream out ) diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java index 22c8a5d05e30f..2faae35590b98 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java @@ -63,7 +63,8 @@ public EnterpriseServerBuilder usingDataDir( String dataDir ) } @Override - protected CommunityNeoServer build(Optional configFile, Config config, GraphDatabaseFacadeFactory.Dependencies dependencies) + protected CommunityNeoServer build( Optional configFile, Config config, + GraphDatabaseFacadeFactory.Dependencies dependencies ) { return new TestEnterpriseNeoServer( config, configFile, dependencies, logProvider ); } diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/AbstractRESTInteraction.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/AbstractRESTInteraction.java index e3bd334a555d7..d74c465edffde 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/AbstractRESTInteraction.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/AbstractRESTInteraction.java @@ -105,7 +105,7 @@ public EnterpriseUserManager getLocalUserManager() throws Exception { return ((EnterpriseAuthAndUserManager) authManager).getUserManager(); } - throw new Exception("The used configuration does not have a user manager"); + throw new Exception( "The used configuration does not have a user manager" ); } @Override diff --git a/integrationtests/src/test/java/org/neo4j/causalclustering/scenarios/BoltCausalClusteringIT.java b/integrationtests/src/test/java/org/neo4j/causalclustering/scenarios/BoltCausalClusteringIT.java index c21d1468c287d..acc9d5fe61053 100644 --- a/integrationtests/src/test/java/org/neo4j/causalclustering/scenarios/BoltCausalClusteringIT.java +++ b/integrationtests/src/test/java/org/neo4j/causalclustering/scenarios/BoltCausalClusteringIT.java @@ -687,7 +687,7 @@ public void transactionsShouldNotAppearOnTheReadReplicaWhilePollingIsPaused() th Driver driver = GraphDatabase.driver( cluster.awaitLeader().routingURI(), AuthTokens.basic( "neo4j", "neo4j" ) ); - try (Session session = driver.session()) + try ( Session session = driver.session() ) { session.writeTransaction( ( tx ) -> { @@ -708,7 +708,7 @@ public void transactionsShouldNotAppearOnTheReadReplicaWhilePollingIsPaused() th final int nodesToCreate = 20000; for ( int i = 0; i < iterations; i++ ) { - try (Session writeSession = driver.session()) + try ( Session writeSession = driver.session() ) { writeSession.writeTransaction( tx -> { diff --git a/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java b/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java index 0fa40b3f9a175..1ea03be22335f 100644 --- a/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java +++ b/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java @@ -924,7 +924,7 @@ public void shouldBeAbleToUseCallYieldWithPeriodicCommit() throws IOException "CALL org.neo4j.procedure.createNode(line[0]) YIELD node as n " + "RETURN n.prop" ); // THEN - for (int i = 1; i <= 100; i++) + for ( int i = 1; i <= 100; i++ ) { assertThat( result.next().get( "n.prop" ), equalTo( Integer.toString( i ) ) ); } @@ -1023,7 +1023,7 @@ public void shouldReturnNodeListTypedAsNodeList() @Test public void shouldGiveNiceErrorMessageWhenAggregationFunctionInProcedureCall() { - try (Transaction ignore = db.beginTx()) + try ( Transaction ignore = db.beginTx() ) { db.createNode( Label.label( "Person" ) ); db.createNode( Label.label( "Person" ) ); @@ -1040,7 +1040,7 @@ public void shouldGiveNiceErrorMessageWhenAggregationFunctionInProcedureCall() @Test public void shouldWorkWhenUsingWithToProjectList() { - try (Transaction ignore = db.beginTx()) + try ( Transaction ignore = db.beginTx() ) { db.createNode( Label.label( "Person" ) ); db.createNode( Label.label( "Person" ) ); @@ -1243,7 +1243,7 @@ public static class MapOutput { public Map map; - public MapOutput(Map map) + public MapOutput( Map map ) { this.map = map; } @@ -1253,7 +1253,7 @@ public static class ListOutput { public List list; - public ListOutput(List list) + public ListOutput( List list ) { this.list = list; } @@ -1282,7 +1282,7 @@ public NodeOutput() } - public NodeOutput(Node node) + public NodeOutput( Node node ) { this.node = node; } @@ -1367,17 +1367,17 @@ public Stream simpleArgument( @Name( "name" ) long someValue ) } @Procedure - public Stream simpleArgumentWithDefault( @Name( value = "name", defaultValue = "42") long someValue ) + public Stream simpleArgumentWithDefault( @Name( value = "name", defaultValue = "42" ) long someValue ) { return Stream.of( new Output( someValue ) ); } @Procedure public Stream defaultValues( - @Name( value = "string", defaultValue = "a string") String string, - @Name( value = "integer", defaultValue = "42") long integer, - @Name( value = "float", defaultValue = "3.14") double aFloat, - @Name( value = "boolean", defaultValue = "true") boolean aBoolean + @Name( value = "string", defaultValue = "a string" ) String string, + @Name( value = "integer", defaultValue = "42" ) long integer, + @Name( value = "float", defaultValue = "3.14" ) double aFloat, + @Name( value = "boolean", defaultValue = "true" ) boolean aBoolean ) { return Stream.of( new PrimitiveOutput( string, integer, aFloat, aBoolean ) ); @@ -1427,27 +1427,31 @@ public Stream mapArgument( @Name( "map" ) Map map ) } @Procedure - public Stream mapWithNullDefault( @Name( value = "map", defaultValue = "null") Map map ) + public Stream mapWithNullDefault( @Name( value = "map", defaultValue = "null" ) Map + map ) { return Stream.of( new MapOutput( map ) ); } @Procedure - public Stream mapWithOtherDefault( @Name( value = "map", defaultValue = "{default: true}") Map map ) + public Stream mapWithOtherDefault( @Name( value = "map", defaultValue = "{default: true}" ) + Map map ) { return Stream.of( new MapOutput( map ) ); } @Procedure - public Stream listWithDefault( @Name( value = "list", defaultValue = "[42, 1337]") List list ) + public Stream listWithDefault( @Name( value = "list", defaultValue = "[42, 1337]" ) List + list ) { - return Stream.of( new ListOutput(list ) ); + return Stream.of( new ListOutput( list ) ); } @Procedure - public Stream genericListWithDefault( @Name( value = "list", defaultValue = "[[42, 1337]]") List> list ) + public Stream genericListWithDefault( @Name( value = "list", defaultValue = "[[42, 1337]]" ) + List> list ) { - return Stream.of( new ListOutput(list.get(0) ) ); + return Stream.of( new ListOutput( list.get( 0 ) ) ); } @Procedure @@ -1590,8 +1594,8 @@ public void sideEffect( @Name( "value" ) String value ) @Procedure( mode = WRITE ) public void sideEffectWithDefault( - @Name("label") String label, - @Name("propertyKey") String propertyKey, + @Name( "label" ) String label, + @Name( "propertyKey" ) String propertyKey, /* Most common name, according to the internet */ @Name( value = "value", defaultValue = "Zhang Wei" ) String value ) { @@ -1637,9 +1641,9 @@ public Stream nodePaths( @Name( "node" ) Node node ) } @Procedure( mode = WRITE ) - public Stream nodeWithDefault( @Name( value = "node", defaultValue = "null") Node node ) + public Stream nodeWithDefault( @Name( value = "node", defaultValue = "null" ) Node node ) { - return Stream.of(new NodeOutput(node)); + return Stream.of( new NodeOutput( node ) ); } @Description( "This is a description" ) diff --git a/integrationtests/src/test/java/org/neo4j/procedure/UserAggregationFunctionIT.java b/integrationtests/src/test/java/org/neo4j/procedure/UserAggregationFunctionIT.java index 51e36e429854b..6021dcb476205 100644 --- a/integrationtests/src/test/java/org/neo4j/procedure/UserAggregationFunctionIT.java +++ b/integrationtests/src/test/java/org/neo4j/procedure/UserAggregationFunctionIT.java @@ -557,7 +557,7 @@ public NodeFromIdAggregator( GraphDatabaseService gds ) } @UserAggregationUpdate - public void update( @Name("id") long id ) + public void update( @Name( "id" ) long id ) { ids.add( id ); } diff --git a/integrationtests/src/test/java/org/neo4j/server/BoltQueryLoggingIT.java b/integrationtests/src/test/java/org/neo4j/server/BoltQueryLoggingIT.java index 5edd96a5ebf15..b531b5f22445c 100644 --- a/integrationtests/src/test/java/org/neo4j/server/BoltQueryLoggingIT.java +++ b/integrationtests/src/test/java/org/neo4j/server/BoltQueryLoggingIT.java @@ -185,10 +185,10 @@ private static byte[] read( DataInputStream dataIn, int howMany ) throws IOExcep byte[] buffer = new byte[howMany]; int offset = 0; - while (offset < howMany) + while ( offset < howMany ) { int read = dataIn.read( buffer, offset, howMany - offset ); - if (read == 0) + if ( read == 0 ) { Thread.yield(); } diff --git a/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java b/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java index 528fd5440601c..0a8b190f681b6 100644 --- a/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java +++ b/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java @@ -120,11 +120,11 @@ private void checkDbAccessible( GraphDatabaseService db ) } } - private GraphDatabaseService startDatabase(boolean allowUpgread) + private GraphDatabaseService startDatabase( boolean allowUpgread ) { GraphDatabaseFactory factory = new TestGraphDatabaseFactory(); GraphDatabaseBuilder builder = factory.newEmbeddedDatabaseBuilder( testDir.graphDbDir() ); - builder.setConfig( GraphDatabaseSettings.allow_store_upgrade, Boolean.toString( allowUpgread )); + builder.setConfig( GraphDatabaseSettings.allow_store_upgrade, Boolean.toString( allowUpgread ) ); builder.setConfig( GraphDatabaseSettings.pagecache_memory, "8m" ); return builder.newGraphDatabase(); } @@ -152,7 +152,7 @@ private void checkIndexData() } } - private void prepareStore(String store) throws IOException + private void prepareStore( String store ) throws IOException { Unzip.unzip( getClass(), store, testDir.graphDbDir() ); } diff --git a/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java b/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java index f0377a9100f4d..81954b8112646 100644 --- a/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java +++ b/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java @@ -297,9 +297,9 @@ public static class StoreUpgradeFailingTest @Rule public TestDirectory testDir = TestDirectory.testDirectory(); - @Parameterized.Parameter(0) + @Parameterized.Parameter( 0 ) public String ignored; // to make JUnit happy... - @Parameterized.Parameter(1) + @Parameterized.Parameter( 1 ) public String dbFileName; @Parameterized.Parameters( name = "{0}" ) diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/portable/Template.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/portable/Template.java index 9fef7063f28ee..50ae41389663b 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/portable/Template.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/portable/Template.java @@ -25,7 +25,6 @@ import java.io.InputStreamReader; import java.io.PrintWriter; import java.nio.charset.StandardCharsets; - import java.util.function.Function; public class Template @@ -52,7 +51,7 @@ public String apply( String name ) public void write( File file ) throws Exception { try ( BufferedReader reader = new BufferedReader( new InputStreamReader( templateFile, StandardCharsets.UTF_8 ) ); - PrintWriter writer = new PrintWriter( file )) + PrintWriter writer = new PrintWriter( file ) ) { String input = reader.readLine(); while ( input != null ) diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/portable/VariableSubstitutor.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/portable/VariableSubstitutor.java index a6b0956512490..d7ec23fe85636 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/portable/VariableSubstitutor.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/portable/VariableSubstitutor.java @@ -48,7 +48,7 @@ public String substitute( String input, Function substitutionFun StringBuilder result = new StringBuilder( ); Matcher matcher = pattern.matcher( input ); int cur = 0; - while (matcher.find( cur )) + while ( matcher.find( cur ) ) { result.append( input.substring( cur, matcher.start() ) ); result.append( substitutionFunction.apply( matcher.group( 1 ) ) ); diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/model/DesktopModel.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/model/DesktopModel.java index e422083aeb9e6..42ed8f66e70e8 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/model/DesktopModel.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/model/DesktopModel.java @@ -97,7 +97,7 @@ public File getDatabaseConfigurationFile() return serverConfigurator.getConfigurationsFile(); } - @SuppressWarnings("ResultOfMethodCallIgnored") + @SuppressWarnings( "ResultOfMethodCallIgnored" ) public void prepareGraphDirectoryForStart() throws UnsuitableDirectoryException { File databaseDirectory = new File( serverConfigurator.getDatabaseDirectory() ); diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/model/exceptions/UnsuitableDirectoryException.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/model/exceptions/UnsuitableDirectoryException.java index 5ca6530fe43e3..670c35798c906 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/model/exceptions/UnsuitableDirectoryException.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/model/exceptions/UnsuitableDirectoryException.java @@ -25,7 +25,7 @@ public class UnsuitableDirectoryException extends Exception { - public UnsuitableDirectoryException(String message, File dir) + public UnsuitableDirectoryException( String message, File dir ) { super( format( message, dir.getAbsolutePath() ) ); } diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/Components.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/Components.java index 3a289560da305..f8cb40e673ab1 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/Components.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/Components.java @@ -41,10 +41,9 @@ import static java.awt.font.TextAttribute.UNDERLINE_ON; import static java.lang.String.format; import static javax.swing.JOptionPane.WARNING_MESSAGE; - import static org.neo4j.desktop.ui.ScrollableOptionPane.showWrappedMessageDialog; -@SuppressWarnings("MagicConstant") +@SuppressWarnings( "MagicConstant" ) public final class Components { public static final int BASE_SPACING_SIZE = 5; diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/EditFileActionListener.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/EditFileActionListener.java index 04d68da0ccf00..6255ef14fc8b5 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/EditFileActionListener.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/EditFileActionListener.java @@ -72,7 +72,7 @@ public void actionPerformed( ActionEvent event ) } } - @SuppressWarnings("ResultOfMethodCallIgnored") + @SuppressWarnings( "ResultOfMethodCallIgnored" ) protected void ensureFileAndParentDirectoriesExists( File file ) throws IOException { file.getParentFile().mkdirs(); diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/PlatformUI.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/PlatformUI.java index 68290146d057b..51dbf075d9366 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/PlatformUI.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/PlatformUI.java @@ -30,7 +30,8 @@ public static void selectPlatformUI() { UIManager.setLookAndFeel( UIManager.getSystemLookAndFeelClassName() ); } - catch ( ClassNotFoundException | UnsupportedLookAndFeelException | InstantiationException | IllegalAccessException e) + catch ( ClassNotFoundException | UnsupportedLookAndFeelException | InstantiationException | + IllegalAccessException e ) { // don't care e.printStackTrace( System.out ); diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/ScrollableOptionPane.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/ScrollableOptionPane.java index 406bbccdcae28..6ce71406daa25 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/ScrollableOptionPane.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/ScrollableOptionPane.java @@ -19,15 +19,14 @@ */ package org.neo4j.desktop.ui; -import static javax.swing.JOptionPane.showConfirmDialog; -import static javax.swing.JOptionPane.showMessageDialog; - import java.awt.Component; - import javax.swing.JScrollPane; import javax.swing.JTextArea; -@SuppressWarnings("MagicConstant") +import static javax.swing.JOptionPane.showConfirmDialog; +import static javax.swing.JOptionPane.showMessageDialog; + +@SuppressWarnings( "MagicConstant" ) public class ScrollableOptionPane { public static void showWrappedMessageDialog( Component parentComponent, String message, String title, diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/SettingsDialog.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/SettingsDialog.java index 227baa0a6d171..ac3495b29cf0c 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/SettingsDialog.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/SettingsDialog.java @@ -19,10 +19,14 @@ */ package org.neo4j.desktop.ui; -import java.awt.*; +import java.awt.Component; +import java.awt.FlowLayout; +import java.awt.Frame; import java.io.File; import java.io.IOException; -import javax.swing.*; +import javax.swing.BoxLayout; +import javax.swing.JButton; +import javax.swing.JDialog; import org.neo4j.desktop.model.DesktopModel; @@ -150,7 +154,7 @@ protected File getFile() return model.getDatabaseConfigurationFile(); } - @SuppressWarnings("ResultOfMethodCallIgnored") + @SuppressWarnings( "ResultOfMethodCallIgnored" ) @Override protected void ensureFileAndParentDirectoriesExists( File file ) throws IOException { diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/TeeOutputStream.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/TeeOutputStream.java index acfa22ceca9af..57f92b3bd9cef 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/TeeOutputStream.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/TeeOutputStream.java @@ -27,7 +27,7 @@ public class TeeOutputStream extends OutputStream private final OutputStream a; private final OutputStream b; - public TeeOutputStream(OutputStream a, OutputStream b) + public TeeOutputStream( OutputStream a, OutputStream b ) { this.a = a; this.b = b; diff --git a/pom.xml b/pom.xml index ca2711b1da070..56ecb04f7e25d 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ com.puppycrawl.tools checkstyle - 7.6 + 7.6.1 diff --git a/stresstests/src/test/java/org/neo4j/backup/BackupHelper.java b/stresstests/src/test/java/org/neo4j/backup/BackupHelper.java index c804014628b60..5dcb38333daf0 100644 --- a/stresstests/src/test/java/org/neo4j/backup/BackupHelper.java +++ b/stresstests/src/test/java/org/neo4j/backup/BackupHelper.java @@ -50,7 +50,7 @@ public static BackupResult backup( String host, int port, File targetDirectory ) boolean failure = false; try { - BackupService backupService = new BackupService(outputStream); + BackupService backupService = new BackupService( outputStream ); BackupService.BackupOutcome backupOutcome = backupService.doIncrementalBackupOrFallbackToFull( host, port, targetDirectory, ConsistencyCheck.FULL, Config.embeddedDefaults(), BackupClient.BIG_READ_TIMEOUT, false ); diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/Workload.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/Workload.java index 7ffa2c7e8fb81..d3c5a95c6ba2b 100644 --- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/Workload.java +++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/Workload.java @@ -44,16 +44,12 @@ public Workload( GraphDatabaseService db, RandomMutation randomMutation, int thr public interface TransactionThroughput { - TransactionThroughput NONE = new TransactionThroughput() + TransactionThroughput NONE = ( transactions, timeSlotMillis ) -> { - @Override - public void report( long transactions, long timeSlotMillis ) - { - // ignore - } + // ignore }; - void report( long transactions, long timeSlotMillis); + void report( long transactions, long timeSlotMillis ); } public void run( long runningTimeMillis, TransactionThroughput throughput ) diff --git a/tools/src/main/java/org/neo4j/tools/dump/InconsistencyReportReader.java b/tools/src/main/java/org/neo4j/tools/dump/InconsistencyReportReader.java index 4fba20069428a..f6cd6b25c7e1a 100644 --- a/tools/src/main/java/org/neo4j/tools/dump/InconsistencyReportReader.java +++ b/tools/src/main/java/org/neo4j/tools/dump/InconsistencyReportReader.java @@ -46,7 +46,7 @@ public InconsistencyReportReader( Inconsistencies inconsistencies ) public void read( File file ) throws IOException { - try ( BufferedReader reader = new BufferedReader( new FileReader( file )) ) + try ( BufferedReader reader = new BufferedReader( new FileReader( file ) ) ) { read( reader ); } @@ -138,7 +138,7 @@ private long id( String line ) return -1; } - private static int min(int... values) + private static int min( int... values ) { int min = Integer.MAX_VALUE; for ( int value : values ) diff --git a/tools/src/main/java/org/neo4j/tools/rebuild/RebuildFromLogs.java b/tools/src/main/java/org/neo4j/tools/rebuild/RebuildFromLogs.java index e0a668a372938..79817a67790f0 100644 --- a/tools/src/main/java/org/neo4j/tools/rebuild/RebuildFromLogs.java +++ b/tools/src/main/java/org/neo4j/tools/rebuild/RebuildFromLogs.java @@ -245,7 +245,7 @@ long applyTransactionsFrom( File sourceDir, long upToTxId ) throws Exception ReadableLogChannel channel = new ReadAheadLogChannel( startingChannel, versionBridge ); long txId = BASE_TX_ID; TransactionQueue queue = new TransactionQueue( 10_000, - (tx, last) -> commitProcess.commit( tx, NULL, EXTERNAL ) ); + ( tx, last ) -> commitProcess.commit( tx, NULL, EXTERNAL ) ); LogEntryReader entryReader = new VersionAwareLogEntryReader<>(); try ( IOCursor cursor = new PhysicalTransactionCursor<>( channel, entryReader ) ) diff --git a/tools/src/test/java/org/neo4j/tools/migration/StoreMigrationTest.java b/tools/src/test/java/org/neo4j/tools/migration/StoreMigrationTest.java index a8babb0f42efc..6512227ccf049 100644 --- a/tools/src/test/java/org/neo4j/tools/migration/StoreMigrationTest.java +++ b/tools/src/test/java/org/neo4j/tools/migration/StoreMigrationTest.java @@ -53,7 +53,7 @@ public void storeMigrationToolShouldBeAbleToMigrateOldStore() throws IOException // after migration we can open store and do something GraphDatabaseService database = new TestGraphDatabaseFactory().newEmbeddedDatabase( testDir.graphDbDir() ); - try (Transaction transaction = database.beginTx()) + try ( Transaction transaction = database.beginTx() ) { Node node = database.createNode(); node.setProperty( "key", "value" ); diff --git a/tools/src/test/java/org/neo4j/tools/rebuild/RebuildFromLogsTest.java b/tools/src/test/java/org/neo4j/tools/rebuild/RebuildFromLogsTest.java index fd133e2d2cc60..bb947baea7988 100644 --- a/tools/src/test/java/org/neo4j/tools/rebuild/RebuildFromLogsTest.java +++ b/tools/src/test/java/org/neo4j/tools/rebuild/RebuildFromLogsTest.java @@ -53,7 +53,7 @@ import static org.junit.Assert.assertEquals; import static org.neo4j.kernel.impl.transaction.log.TransactionIdStore.BASE_TX_ID; -@RunWith(Parameterized.class) +@RunWith( Parameterized.class ) public class RebuildFromLogsTest { private final TestDirectory dir = TestDirectory.testDirectory(); @@ -67,7 +67,7 @@ public class RebuildFromLogsTest private final Transaction[] work; - @Parameterized.Parameters(name = "{0}") + @Parameterized.Parameters( name = "{0}" ) public static Collection commands() { return WorkLog.combinations(); diff --git a/tools/src/test/java/org/neo4j/tools/txlog/CheckTxLogsTest.java b/tools/src/test/java/org/neo4j/tools/txlog/CheckTxLogsTest.java index e54640cd89906..2ef8c56a53573 100644 --- a/tools/src/test/java/org/neo4j/tools/txlog/CheckTxLogsTest.java +++ b/tools/src/test/java/org/neo4j/tools/txlog/CheckTxLogsTest.java @@ -53,7 +53,6 @@ import org.neo4j.kernel.impl.transaction.log.entry.LogHeaderWriter; import org.neo4j.test.rule.SuppressOutput; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; -import org.neo4j.tools.txlog.checktypes.CheckTypes; import static org.hamcrest.Matchers.lessThan; import static org.junit.Assert.assertEquals; @@ -941,13 +940,13 @@ private void writeTxContent( File log, long txId, Command... commands ) throws I { PhysicalTransactionRepresentation tx = new PhysicalTransactionRepresentation( Arrays.asList( commands ) ); tx.setHeader( new byte[0], 0, 0, 0, 0, 0, 0 ); - writeContent( log, (txWriter) -> txWriter.append( tx, txId ) ); + writeContent( log, ( txWriter ) -> txWriter.append( tx, txId ) ); } private void writeCheckPoint( File log, long logVersion, long byteOffset ) throws IOException { LogPosition logPosition = new LogPosition( logVersion, byteOffset ); - writeContent( log, (txWriter) -> txWriter.checkPoint( logPosition ) ); + writeContent( log, ( txWriter ) -> txWriter.checkPoint( logPosition ) ); } private void writeContent( File log, ThrowingConsumer consumer )