This is an automated email from the ASF dual-hosted git repository. wirebaron pushed a commit to branch feature/transcoding_experiments in repository https://gitbox.apache.org/repos/asf/geode.git
commit 357e085e3ef8bbb632527c77cde5220374540578 Merge: eb37bb4 c303d01 Author: Brian Rowe <[email protected]> AuthorDate: Wed Apr 18 16:23:56 2018 -0700 Merge branch 'develop' into feature/transcoding_experiments build.gradle | 3 +- ci/scripts/update-passing-ref.sh | 3 + extensions/geode-modules-assembly/build.gradle | 12 + .../geode-cs-tomcat-85/context-fragment.xml | 15 + .../geode-p2p-tomcat-85/context-fragment.xml | 15 + .../internal/common/ClientServerSessionCache.java | 2 - .../internal/common/PeerToPeerSessionCache.java | 3 - .../internal/filter/GemfireHttpSession.java | 1 - .../internal/filter/GemfireSessionManager.java | 3 - .../attributes/AbstractSessionAttributes.java | 2 - .../filter/attributes/SessionAttributes.java | 1 - .../session/internal/filter/util/TypeAwareMap.java | 3 - .../session/filter/SessionCachingFilter.java | 2 - .../modules/session/filter/SessionListener.java | 1 - .../geode/modules/session/installer/Installer.java | 3 - .../modules/session/installer/args/Argument.java | 1 - .../session/internal/filter/AbstractListener.java | 2 - .../session/internal/filter/BasicServlet.java | 3 - .../session/internal/filter/CommonTests.java | 1 - .../filter/HttpSessionAttributeListenerImpl.java | 3 - .../session/internal/filter/RendezvousManager.java | 3 - .../ServletRequestAttributeListenerImpl.java | 2 - .../geode/modules/session/EmbeddedTomcat8.java | 6 - .../modules/session/TestSessionsTomcat8Base.java | 2 - .../Tomcat8SessionsClientServerDUnitTest.java | 4 - .../modules/session/Tomcat8SessionsDUnitTest.java | 3 - .../gatewaydelta/GatewayDeltaCreateEvent.java | 2 - .../gatewaydelta/GatewayDeltaDestroyEvent.java | 2 - .../session/catalina/DeltaSessionInterface.java | 1 - .../internal/DeltaSessionAttributeEventBatch.java | 1 - .../DeltaSessionDestroyAttributeEvent.java | 3 - .../internal/DeltaSessionUpdateAttributeEvent.java | 1 - .../java/org/apache/geode/modules/util/Banner.java | 3 - .../apache/geode/modules/util/ContextMapper.java | 1 - .../geode/modules/session/CommandServlet.java | 7 - .../geode/modules/session/EmbeddedTomcat.java | 3 - .../modules/session/Tomcat6SessionsJUnitTest.java | 1 - .../util/ClassLoaderObjectInputStreamTest.java | 1 - .../geode/modules/session/CommandServlet.java | 7 - .../session/functions/GetMaxInactiveInterval.java | 1 - geode-assembly/build.gradle | 2 +- geode-assembly/src/main/dist/NOTICE | 2 +- .../cli/commands/DestroyIndexIfExistsTest.java | 5 - .../LauncherLifecycleCommandsDUnitTest.java | 1 - .../shell/StatusLocatorExitCodeAcceptanceTest.java | 6 - .../shell/StatusServerExitCodeAcceptanceTest.java | 5 - .../geode/rest/internal/web/controllers/Item.java | 1 - .../geode/rest/internal/web/controllers/Order.java | 1 - .../rest/internal/web/controllers/Person.java | 1 - .../apache/geode/session/tests/CargoTestBase.java | 1 - .../tests/GenericAppServerClientServerTest.java | 2 - .../tests/Jetty9CachingClientServerTest.java | 3 - .../geode/session/tests/ServerContainer.java | 1 - .../session/tests/Tomcat7ClientServerTest.java | 1 - geode-book/config.yml | 6 +- .../source/subnavs/geode-subnav.erb | 13 +- .../test/concurrency/ConcurrentTestRunner.java | 3 - geode-connectors/build.gradle | 5 +- .../geode/connectors/jdbc/JdbcAsyncWriter.java | 6 +- .../connectors/jdbc/JdbcConnectorException.java | 8 +- .../apache/geode/connectors/jdbc/JdbcLoader.java | 3 +- .../apache/geode/connectors/jdbc/JdbcWriter.java | 3 +- .../jdbc/internal/AbstractJdbcCallback.java | 3 +- .../internal/{ColumnValue.java => ColumnData.java} | 14 +- .../jdbc/internal/ConnectionConfigBuilder.java | 82 -- .../internal/ConnectionConfigExistsException.java | 3 - .../ConnectionConfigNotFoundException.java | 3 - .../jdbc/internal/ConnectionConfiguration.java | 110 --- .../jdbc/internal/DataSourceManager.java | 7 +- ...NotFoundException.java => EntryColumnData.java} | 22 +- .../jdbc/internal/HikariJdbcDataSource.java | 4 +- .../jdbc/internal/HikariJdbcDataSourceFactory.java | 4 +- .../jdbc/internal/JdbcConnectorService.java | 26 +- .../jdbc/internal/JdbcConnectorServiceImpl.java | 77 +- .../jdbc/internal/JdbcDataSourceFactory.java | 4 +- .../connectors/jdbc/internal/RegionMapping.java | 291 ------- .../jdbc/internal/RegionMappingBuilder.java | 99 --- .../internal/RegionMappingExistsException.java | 3 - .../internal/RegionMappingNotFoundException.java | 3 - .../geode/connectors/jdbc/internal/SqlHandler.java | 173 +++-- .../jdbc/internal/SqlStatementFactory.java | 87 +-- .../jdbc/internal/SqlToPdxInstanceCreator.java | 10 +- .../connectors/jdbc/internal/TableMetaData.java | 9 +- .../jdbc/internal/TableMetaDataManager.java | 6 +- .../jdbc/internal/TableMetaDataView.java | 10 +- .../jdbc/internal/cli/AlterConnectionCommand.java | 118 ++- .../jdbc/internal/cli/AlterConnectionFunction.java | 40 +- .../jdbc/internal/cli/AlterMappingCommand.java | 120 ++- .../jdbc/internal/cli/AlterMappingFunction.java | 50 +- .../jdbc/internal/cli/CreateConnectionCommand.java | 104 +-- .../internal/cli/CreateConnectionFunction.java | 13 +- .../jdbc/internal/cli/CreateMappingCommand.java | 91 +-- .../jdbc/internal/cli/CreateMappingFunction.java | 27 +- .../internal/cli/DescribeConnectionCommand.java | 86 ++- .../internal/cli/DescribeConnectionFunction.java | 9 +- .../jdbc/internal/cli/DescribeMappingCommand.java | 83 +- .../jdbc/internal/cli/DescribeMappingFunction.java | 10 +- .../internal/cli/DestroyConnectionCommand.java | 82 +- .../internal/cli/DestroyConnectionFunction.java | 7 +- .../jdbc/internal/cli/DestroyMappingCommand.java | 73 +- .../jdbc/internal/cli/DestroyMappingFunction.java | 7 +- .../jdbc/internal/cli/ExceptionHandler.java | 2 - .../cli/FunctionContextArgumentProvider.java | 11 +- .../jdbc/internal/cli/JdbcCliFunction.java | 7 +- .../jdbc/internal/cli/ListConnectionCommand.java | 86 ++- .../jdbc/internal/cli/ListConnectionFunction.java | 18 +- .../jdbc/internal/cli/ListMappingCommand.java | 85 ++- .../jdbc/internal/cli/ListMappingFunction.java | 19 +- .../internal/configuration/ConnectorService.java | 834 ++++++++++++++++++++ .../package-info.java} | 17 +- .../connectors/jdbc/internal/xml/ElementType.java | 50 +- .../xml/JdbcConnectorServiceXmlGenerator.java | 165 ---- .../internal/xml/JdbcServiceConfiguration.java | 18 +- .../ConnectorsDistributedSystemService.java | 2 - .../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 5 - .../sanctioned-geode-connectors-serializables.txt | 6 +- .../AnalyzeConnectorsSerializablesJUnitTest.java | 1 - .../jdbc/JdbcAsyncWriterIntegrationTest.java | 11 +- .../jdbc/JdbcConnectorExceptionTest.java | 2 +- .../geode/connectors/jdbc/JdbcDistributedTest.java | 26 +- .../connectors/jdbc/MySqlJdbcDistributedTest.java | 13 +- .../jdbc/PostgresJdbcDistributedTest.java | 9 +- .../{ColumnValueTest.java => ColumnDataTest.java} | 15 +- .../jdbc/internal/ConnectionConfigBuilderTest.java | 92 --- .../jdbc/internal/ConnectionConfigurationTest.java | 96 --- .../jdbc/internal/DataSourceManagerUnitTest.java | 11 +- .../jdbc/internal/JdbcConnectorServiceTest.java | 24 +- .../jdbc/internal/RegionMappingBuilderTest.java | 121 --- .../jdbc/internal/RegionMappingTest.java | 237 +++--- .../connectors/jdbc/internal/SqlHandlerTest.java | 43 +- .../jdbc/internal/SqlStatementFactoryTest.java | 34 +- .../jdbc/internal/SqlToPdxInstanceCreatorTest.java | 5 +- .../TableMetaDataManagerIntegrationTest.java | 8 +- .../jdbc/internal/TableMetaDataManagerTest.java | 24 + .../jdbc/internal/TestConfigService.java | 15 +- .../cli/AlterConnectionCommandDUnitTest.java | 19 +- .../cli/AlterConnectionCommandIntegrationTest.java | 4 +- .../internal/cli/AlterConnectionCommandTest.java | 147 ++++ .../internal/cli/AlterConnectionFunctionTest.java | 106 ++- .../internal/cli/AlterMappingCommandDUnitTest.java | 19 +- .../cli/AlterMappingCommandIntegrationTest.java | 8 +- .../jdbc/internal/cli/AlterMappingCommandTest.java | 154 ++++ .../internal/cli/AlterMappingFunctionTest.java | 151 ++-- .../cli/CreateConnectionCommandDUnitTest.java | 4 +- .../CreateConnectionCommandIntegrationTest.java | 22 +- .../internal/cli/CreateConnectionFunctionTest.java | 10 +- .../cli/CreateMappingCommandDUnitTest.java | 24 +- .../cli/CreateMappingCommandIntegrationTest.java | 25 +- .../internal/cli/CreateMappingFunctionTest.java | 9 +- .../cli/DescribeConnectionCommandDUnitTest.java | 80 +- .../DescribeConnectionCommandIntegrationTest.java | 150 ---- .../cli/DescribeConnectionCommandTest.java | 126 +++ .../cli/DescribeConnectionFunctionTest.java | 6 +- .../cli/DescribeMappingCommandDUnitTest.java | 74 +- .../cli/DescribeMappingCommandIntegrationTest.java | 145 ---- .../internal/cli/DescribeMappingCommandTest.java | 138 ++++ .../internal/cli/DescribeMappingFunctionTest.java | 6 +- .../cli/DestroyConnectionCommandDUnitTest.java | 32 +- .../DestroyConnectionCommandIntegrationTest.java | 9 +- .../cli/DestroyConnectionFunctionTest.java | 7 +- .../cli/DestroyMappingCommandDunitTest.java | 35 +- .../cli/DestroyMappingCommandFunctionTest.java | 7 +- .../cli/DestroyMappingCommandIntegrationTest.java | 7 +- .../internal/cli/JDBCCommandsAvailabilityTest.java | 48 ++ .../cli/JDBCConnectorFunctionsSecurityTest.java | 4 - .../jdbc/internal/cli/JdbcCliFunctionTest.java | 1 - .../cli/JdbcClusterConfigDistributedTest.java | 4 +- .../cli/ListConnectionCommandDUnitTest.java | 70 +- .../cli/ListConnectionCommandIntegrationTest.java | 110 --- .../internal/cli/ListConnectionCommandTest.java | 132 ++++ .../internal/cli/ListConnectionFunctionTest.java | 30 +- .../internal/cli/ListMappingCommandDUnitTest.java | 79 +- .../cli/ListMappingCommandIntegrationTest.java | 110 --- .../jdbc/internal/cli/ListMappingCommandTest.java | 141 ++++ .../jdbc/internal/cli/ListMappingFunctionTest.java | 32 +- .../configuration/ConnectorServiceTest.java | 102 +++ .../jdbc/internal/xml/ElementTypeTest.java | 40 +- ...onnectorServiceXmlGeneratorIntegrationTest.java | 334 -------- .../xml/JdbcConnectorServiceXmlGeneratorTest.java | 34 - .../JdbcConnectorServiceXmlIntegrationTest.java | 127 ---- .../internal/xml/JdbcServiceConfigurationTest.java | 68 +- .../geode/internal/ra/GFConnectionFactoryImpl.java | 4 - .../apache/geode/internal/ra/GFConnectionImpl.java | 4 - .../ra/spi/JCAManagedConnectionFactory.java | 4 - .../ra/spi/JCAManagedConnectionMetaData.java | 4 - .../java/org/apache/geode/CancelException.java | 3 - .../main/java/org/apache/geode/DataSerializer.java | 1 - .../src/main/java/org/apache/geode/Delta.java | 3 - .../apache/geode/DeltaSerializationException.java | 13 - .../java/org/apache/geode/GemFireRethrowable.java | 1 - .../org/apache/geode/InternalGemFireError.java | 16 - .../src/main/java/org/apache/geode/LogWriter.java | 1 - .../org/apache/geode/SerializationException.java | 1 - .../main/java/org/apache/geode/SystemFailure.java | 1 - .../apache/geode/admin/AdminDistributedSystem.java | 2 - .../admin/internal/AdminDistributedSystemImpl.java | 3 - .../internal/AdminDistributedSystemJmxImpl.java | 1 - .../apache/geode/admin/jmx/internal/AgentImpl.java | 1 - .../internal/ConfigurationParameterJmxImpl.java | 1 - .../jmx/internal/MemberInfoWithStatsMBean.java | 7 - .../admin/jmx/internal/StatAlertsAggregator.java | 2 - .../jmx/internal/StatisticResourceJmxImpl.java | 1 - .../jmx/internal/SystemMemberCacheJmxImpl.java | 1 - .../org/apache/geode/cache/AttributesFactory.java | 2 - .../org/apache/geode/cache/AttributesMutator.java | 5 - .../main/java/org/apache/geode/cache/Cache.java | 3 - .../apache/geode/cache/CacheClosedException.java | 2 - .../geode/cache/CacheTransactionManager.java | 2 - .../java/org/apache/geode/cache/DiskStore.java | 1 - .../geode/cache/DiskWriteAttributesFactory.java | 1 - .../org/apache/geode/cache/EvictionAction.java | 1 - .../org/apache/geode/cache/LowMemoryException.java | 1 - .../apache/geode/cache/PartitionAttributes.java | 2 - .../geode/cache/PartitionAttributesFactory.java | 5 - .../main/java/org/apache/geode/cache/Region.java | 1 - .../geode/cache/TransactionWriterException.java | 3 - .../geode/cache/asyncqueue/AsyncEventQueue.java | 8 - .../cache/asyncqueue/AsyncEventQueueFactory.java | 4 - .../asyncqueue/internal/AsyncEventQueueStats.java | 9 +- .../geode/cache/client/ClientCacheFactory.java | 21 + .../geode/cache/client/ClientRegionFactory.java | 1 - .../org/apache/geode/cache/client/PoolFactory.java | 6 + .../geode/cache/client/internal/AbstractOp.java | 1 - .../cache/client/internal/AuthenticateUserOp.java | 4 - .../client/internal/AutoConnectionSourceImpl.java | 1 - .../client/internal/ClientSideHandshakeImpl.java | 3 - .../geode/cache/client/internal/ClientUpdater.java | 3 - .../cache/client/internal/EndpointManager.java | 1 - .../cache/client/internal/EndpointManagerImpl.java | 3 - .../cache/client/internal/ExecutablePool.java | 1 - .../client/internal/ExecuteFunctionNoAckOp.java | 9 - .../geode/cache/client/internal/GetEntryOp.java | 3 - .../geode/cache/client/internal/PoolImpl.java | 2 - .../geode/cache/client/internal/PrimaryAckOp.java | 1 - .../geode/cache/client/internal/ProxyCache.java | 2 - .../geode/cache/client/internal/ProxyRegion.java | 1 - .../apache/geode/cache/client/internal/PutOp.java | 2 - .../cache/client/internal/QueueStateImpl.java | 1 - .../cache/client/internal/ReadyForEventsOp.java | 1 - .../geode/cache/client/internal/ServerProxy.java | 1 - .../client/internal/ServerRegionDataAccess.java | 4 - .../cache/client/internal/ServerRegionProxy.java | 5 - .../client/internal/SingleHopClientExecutor.java | 4 - .../internal/SingleHopOperationCallable.java | 4 - .../cache/client/internal/TXSynchronizationOp.java | 5 - .../internal/locator/GetAllServersRequest.java | 5 - .../internal/locator/GetAllServersResponse.java | 7 - .../internal/locator/LocatorListRequest.java | 3 - .../internal/locator/LocatorListResponse.java | 4 - .../internal/locator/SerializationHelper.java | 3 - .../internal/locator/ServerLocationRequest.java | 3 - .../internal/locator/ServerLocationResponse.java | 3 - .../locator/wan/LocatorMembershipListener.java | 1 - .../client/internal/pooling/ConnectionManager.java | 1 - .../internal/pooling/ConnectionManagerImpl.java | 1 - .../geode/cache/configuration/CacheConfig.java | 846 +++++++++------------ .../geode/cache/configuration/CacheLoaderType.java | 10 +- .../configuration/CacheTransactionManagerType.java | 30 +- .../geode/cache/configuration/CacheWriterType.java | 10 +- .../configuration/ClassWithParametersType.java | 10 +- .../geode/cache/configuration/DeclarableType.java | 10 +- .../geode/cache/configuration/DiskDirType.java | 20 +- .../geode/cache/configuration/DiskStoreType.java | 110 ++- .../configuration/DynamicRegionFactoryType.java | 40 +- .../configuration/ExpirationAttributesType.java | 40 +- .../cache/configuration/FunctionServiceType.java | 10 +- .../geode/cache/configuration/InitializerType.java | 10 +- .../cache/configuration/JndiBindingsType.java | 180 ++--- .../geode/cache/configuration/ParameterType.java | 30 +- .../apache/geode/cache/configuration/PdxType.java | 60 +- .../apache/geode/cache/configuration/PoolType.java | 250 +++--- .../cache/configuration/RegionAttributesType.java | 830 ++++++++------------ .../geode/cache/configuration/RegionConfig.java | 200 ++--- .../cache/configuration/ResourceManagerType.java | 40 +- .../SerializationRegistrationType.java | 30 +- .../geode/cache/configuration/ServerType.java | 180 ++--- .../geode/cache/configuration/StringType.java | 10 +- .../geode/cache/configuration/package-info.java | 16 +- .../execute/EmptyRegionFunctionException.java | 1 - .../org/apache/geode/cache/execute/Function.java | 1 - .../geode/cache/execute/FunctionContext.java | 1 - .../geode/cache/execute/FunctionException.java | 5 - .../geode/cache/execute/FunctionService.java | 11 - .../geode/cache/execute/ResultCollector.java | 1 - .../apache/geode/cache/execute/ResultSender.java | 2 - .../execute/internal/FunctionServiceManager.java | 8 - .../cache/partition/PartitionRegionHelper.java | 3 - .../ConflictingPersistentDataException.java | 1 - .../org/apache/geode/cache/query/Aggregator.java | 1 - .../geode/cache/query/CqServiceStatistics.java | 1 - .../cache/query/MultiIndexCreationException.java | 1 - .../org/apache/geode/cache/query/QueryService.java | 1 - .../internal/AbstractGroupOrRangeJunction.java | 9 - .../cache/query/internal/AllGroupJunction.java | 9 - .../cache/query/internal/AttributeDescriptor.java | 3 - .../org/apache/geode/cache/query/internal/Bag.java | 17 - .../query/internal/CompiledAggregateFunction.java | 4 - .../cache/query/internal/CompiledArithmetic.java | 1 - .../cache/query/internal/CompiledComparison.java | 1 - .../query/internal/CompiledGroupBySelect.java | 4 - .../geode/cache/query/internal/CompiledIn.java | 1 - .../cache/query/internal/CompiledJunction.java | 5 - .../geode/cache/query/internal/CompiledSelect.java | 7 - .../query/internal/CompiledSortCriterion.java | 1 - .../cache/query/internal/CompiledUnaryMinus.java | 23 - .../cache/query/internal/CompiledUndefined.java | 1 - .../geode/cache/query/internal/CqStateImpl.java | 1 - .../internal/CumulativeNonDistinctResults.java | 2 - .../cache/query/internal/DefaultQueryService.java | 9 - .../apache/geode/cache/query/internal/Filter.java | 35 - .../cache/query/internal/HashingStrategy.java | 3 - .../query/internal/IndexTrackingQueryObserver.java | 1 - .../geode/cache/query/internal/Indexable.java | 3 - .../cache/query/internal/LinkedResultSet.java | 2 - .../geode/cache/query/internal/PathUtils.java | 3 - .../cache/query/internal/ProxyQueryService.java | 1 - .../geode/cache/query/internal/QCompiler.java | 2 - .../internal/QueryExecutionCanceledException.java | 1 - .../geode/cache/query/internal/QueryObserver.java | 14 - .../geode/cache/query/internal/QueryUtils.java | 1 - .../geode/cache/query/internal/RangeJunction.java | 7 - .../geode/cache/query/internal/ResultsBag.java | 2 - .../query/internal/ResultsCollectionWrapper.java | 4 - .../cache/query/internal/SortedResultsBag.java | 10 - .../cache/query/internal/SortedStructBag.java | 16 - .../geode/cache/query/internal/cq/ClientCQ.java | 1 - .../cache/query/internal/cq/CqAttributesImpl.java | 2 - .../geode/cache/query/internal/cq/CqService.java | 21 - .../cache/query/internal/cq/InternalCqQuery.java | 1 - .../geode/cache/query/internal/cq/ServerCQ.java | 6 - .../cache/query/internal/index/HashIndexSet.java | 5 - .../cache/query/internal/index/IMQException.java | 3 - .../internal/index/IndexConcurrentHashSet.java | 3 - .../query/internal/index/IndexCreationData.java | 1 - .../cache/query/internal/index/IndexElemArray.java | 3 - .../cache/query/internal/index/IndexManager.java | 1 - .../cache/query/internal/index/IndexProtocol.java | 22 - .../cache/query/internal/index/IndexStore.java | 7 - .../internal/index/IndexedExpressionEvaluator.java | 3 - .../query/internal/index/MemoryIndexStore.java | 2 - .../query/internal/index/PartitionedIndex.java | 2 - .../query/internal/parse/ASTAggregateFunc.java | 4 - .../query/internal/parse/ASTArithmeticOp.java | 1 - .../cache/query/internal/parse/ASTCombination.java | 3 - .../cache/query/internal/parse/ASTGroupBy.java | 4 - .../geode/cache/query/internal/parse/ASTHint.java | 3 - .../query/internal/parse/ASTHintIdentifier.java | 3 - .../cache/query/internal/parse/ASTIteratorDef.java | 3 - .../geode/cache/query/internal/parse/ASTLike.java | 6 - .../geode/cache/query/internal/parse/ASTLimit.java | 3 - .../cache/query/internal/parse/ASTOrderBy.java | 4 - .../cache/query/internal/parse/ASTSelect.java | 1 - .../query/internal/parse/ASTSortCriterion.java | 3 - .../geode/cache/query/internal/parse/ASTTrace.java | 3 - .../geode/cache/query/internal/parse/ASTUnary.java | 12 - .../cache/query/internal/parse/GemFireAST.java | 3 - .../cache/query/internal/parse/UtilParser.java | 3 - .../query/internal/types/CollectionTypeImpl.java | 1 - .../cache/query/internal/types/ObjectTypeImpl.java | 1 - .../cache/query/internal/types/TypeUtils.java | 32 - .../org/apache/geode/cache/server/CacheServer.java | 1 - .../cache/server/ClientSubscriptionConfig.java | 1 - .../geode/cache/snapshot/SnapshotOptions.java | 1 - .../apache/geode/cache/wan/GatewayEventFilter.java | 3 - .../geode/cache/wan/GatewayReceiverFactory.java | 2 - .../org/apache/geode/cache/wan/GatewaySender.java | 2 - .../geode/cache/wan/GatewaySenderFactory.java | 5 - .../org/apache/geode/compression/Compressor.java | 2 - .../distributed/ClusterConfigurationService.java | 50 +- .../geode/distributed/DistributedSystem.java | 1 - .../internal/AtomicLongWithTerminalState.java | 2 - .../internal/ClusterDistributionManager.java | 3 - .../internal/ConfigAttributeChecker.java | 2 - .../apache/geode/distributed/internal/DMStats.java | 1 - .../distributed/internal/DirectReplyProcessor.java | 6 - .../distributed/internal/DistributionAdvisor.java | 4 - .../distributed/internal/DistributionConfig.java | 2 - .../internal/DistributionConfigImpl.java | 20 +- .../distributed/internal/DistributionManager.java | 1 - .../internal/HighPriorityDistributionMessage.java | 3 - .../InternalClusterConfigurationService.java | 109 +-- .../internal/InternalDistributedSystem.java | 6 +- .../distributed/internal/InternalLocator.java | 2 +- .../internal/ReliableReplyException.java | 3 - .../internal/ReliableReplyProcessor21.java | 4 - .../geode/distributed/internal/ReplyMessage.java | 4 - .../geode/distributed/internal/ServerLocator.java | 6 - .../geode/distributed/internal/StartupMessage.java | 1 - .../distributed/internal/StartupMessageData.java | 4 - .../ThrottlingMemLinkedQueueWithDMStats.java | 1 - .../internal/WaitForViewInstallation.java | 6 - .../internal/deadlock/DependencyGraph.java | 2 - .../internal/deadlock/UnsafeThreadLocal.java | 1 - .../distributed/internal/direct/DirectChannel.java | 8 - .../distributed/internal/locks/DLockGrantor.java | 1 - .../membership/InternalDistributedMember.java | 1 - .../internal/membership/MembershipManager.java | 1 - .../internal/membership/MembershipTestHook.java | 3 - .../distributed/internal/membership/NetMember.java | 1 - .../internal/membership/gms/GMSUtil.java | 2 - .../internal/membership/gms/NetLocator.java | 1 - .../internal/membership/gms/ServiceConfig.java | 1 - .../membership/gms/interfaces/HealthMonitor.java | 4 - .../membership/gms/interfaces/Manager.java | 4 - .../membership/gms/interfaces/Messenger.java | 4 - .../membership/gms/membership/GMSJoinLeave.java | 7 - .../membership/gms/membership/HostAddress.java | 1 - .../membership/gms/messenger/AddressManager.java | 1 - .../membership/gms/messenger/GMSEncrypt.java | 429 ++--------- .../gms/messenger/GMSEncryptionCipherPool.java | 92 +++ .../membership/gms/messenger/JGroupsMessenger.java | 5 +- .../internal/streaming/StreamingOperation.java | 3 - .../distributed/internal/tcpserver/TcpClient.java | 6 - .../distributed/internal/tcpserver/TcpHandler.java | 2 - .../java/org/apache/geode/i18n/LogWriterI18n.java | 1 - .../org/apache/geode/internal/AvailablePort.java | 1 - .../apache/geode/internal/ByteArrayDataInput.java | 6 +- .../java/org/apache/geode/internal/Config.java | 9 +- .../apache/geode/internal/CopyOnWriteHashSet.java | 1 - .../geode/internal/HeapDataOutputStream.java | 2 - .../org/apache/geode/internal/HistogramStats.java | 2 - .../geode/internal/InternalInstantiator.java | 4 - .../java/org/apache/geode/internal/ObjIdMap.java | 1 - .../ScheduledThreadPoolExecutorWithKeepAlive.java | 4 - .../java/org/apache/geode/internal/Sendable.java | 1 - .../org/apache/geode/internal/SystemAdmin.java | 1 - .../java/org/apache/geode/internal/Version.java | 73 +- .../apache/geode/internal/admin/ListenerIdMap.java | 1 - .../geode/internal/admin/StatAlertsManager.java | 1 - .../admin/remote/AddStatListenerRequest.java | 1 - .../geode/internal/admin/remote/AdminRegion.java | 1 - .../geode/internal/admin/remote/AdminWaiters.java | 3 - .../internal/admin/remote/CacheInfoRequest.java | 1 - .../internal/admin/remote/ClientHealthStats.java | 1 - .../internal/admin/remote/CompactResponse.java | 3 - .../admin/remote/DistributionLocatorId.java | 1 - .../admin/remote/DurableClientInfoRequest.java | 1 - .../admin/remote/FetchDistLockInfoRequest.java | 1 - .../internal/admin/remote/LicenseInfoRequest.java | 1 - .../admin/remote/ObjectDetailsRequest.java | 1 - .../internal/admin/remote/ObjectNamesRequest.java | 1 - .../admin/remote/RegionAttributesRequest.java | 1 - .../geode/internal/admin/remote/RegionRequest.java | 1 - .../internal/admin/remote/RegionSizeRequest.java | 1 - .../admin/remote/RemoteTransportConfig.java | 1 - .../admin/remote/ResetHealthStatusRequest.java | 1 - .../admin/remote/RevokePersistentIDResponse.java | 3 - .../internal/admin/remote/ShutdownAllResponse.java | 3 - .../internal/admin/remote/StatListenerMessage.java | 1 - .../internal/admin/remote/SubRegionRequest.java | 1 - .../internal/admin/remote/VersionInfoRequest.java | 1 - .../admin/statalerts/BaseDecoratorImpl.java | 3 - .../admin/statalerts/DummyStatisticInfoImpl.java | 4 - .../statalerts/GaugeThresholdDecoratorImpl.java | 3 - .../admin/statalerts/MultiAttrDefinitionImpl.java | 3 - .../admin/statalerts/SingleAttrDefinitionImpl.java | 3 - .../admin/statalerts/StatisticInfoImpl.java | 4 - .../internal/cache/AbstractBucketRegionQueue.java | 15 +- .../geode/internal/cache/AbstractDiskRegion.java | 2 - .../geode/internal/cache/AbstractRegion.java | 212 +++--- .../geode/internal/cache/AbstractRegionMap.java | 12 + .../apache/geode/internal/cache/BucketAdvisor.java | 5 +- .../internal/cache/BucketNotFoundException.java | 6 - .../internal/cache/BucketPersistenceAdvisor.java | 4 - .../geode/internal/cache/BucketRegionQueue.java | 16 +- .../internal/cache/CacheDistributionAdvisor.java | 1 - .../apache/geode/internal/cache/CacheObserver.java | 2 - .../geode/internal/cache/CacheServerImpl.java | 1 - .../geode/internal/cache/CacheStatisticsImpl.java | 4 - .../geode/internal/cache/CachedDeserializable.java | 1 - .../internal/cache/ClientRegionEventImpl.java | 5 - .../geode/internal/cache/ClientServerObserver.java | 3 - .../cache/ClientServerObserverAdapter.java | 3 - .../cache/ClientSubscriptionConfigImpl.java | 4 - .../geode/internal/cache/CloseCacheMessage.java | 5 - .../internal/cache/ClusterConfigurationLoader.java | 4 +- .../geode/internal/cache/ColocationLogger.java | 2 - .../internal/cache/DestroyRegionOperation.java | 3 - .../apache/geode/internal/cache/DiskRegion.java | 1 - .../geode/internal/cache/DiskStoreAttributes.java | 3 - .../geode/internal/cache/DiskStoreObserver.java | 1 - .../apache/geode/internal/cache/DiskStoreTask.java | 3 - .../internal/cache/DiskWriteAttributesImpl.java | 9 - .../internal/cache/DistTXPrecommitMessage.java | 6 - .../internal/cache/DistTXRollbackMessage.java | 3 - .../internal/cache/DistributedClearOperation.java | 6 - .../internal/cache/DistributedPutAllOperation.java | 10 - .../cache/DistributedRemoveAllOperation.java | 9 - .../cache/DistributedTombstoneOperation.java | 3 - .../geode/internal/cache/EntryEventImpl.java | 3 + .../geode/internal/cache/ExportDiskRegion.java | 1 - .../cache/FixedPartitionAttributesImpl.java | 3 - .../FunctionStreamingOrderedReplyMessage.java | 4 - .../geode/internal/cache/GatewayEventFilter.java | 4 - .../geode/internal/cache/GemFireCacheImpl.java | 1 - .../geode/internal/cache/GemfireCacheHelper.java | 1 - .../org/apache/geode/internal/cache/HARegion.java | 10 - .../cache/InMemoryPersistentMemberView.java | 3 - .../internal/cache/InitialImageOperation.java | 5 - .../geode/internal/cache/InternalCacheEvent.java | 1 - .../geode/internal/cache/InternalDataView.java | 73 -- .../internal/cache/InternalRegionArguments.java | 10 - .../cache/InvalidatePartitionedRegionMessage.java | 9 - .../internal/cache/InvalidateRegionOperation.java | 4 - .../org/apache/geode/internal/cache/KeyInfo.java | 6 - .../apache/geode/internal/cache/LocalDataSet.java | 4 - .../apache/geode/internal/cache/LocalRegion.java | 12 - .../java/org/apache/geode/internal/cache/Node.java | 1 - .../cache/NonLocalRegionEntryWithStats.java | 3 - .../internal/cache/PRContainsValueFunction.java | 3 - .../internal/cache/PRHARedundancyProvider.java | 11 - .../internal/cache/PartitionRegionConfig.java | 4 + .../cache/PartitionRegionConfigValidator.java | 7 - .../geode/internal/cache/PartitionedRegion.java | 61 +- .../cache/PartitionedRegionBucketMgmtHelper.java | 1 - .../internal/cache/PartitionedRegionDataStore.java | 30 +- .../internal/cache/PartitionedRegionException.java | 1 - .../internal/cache/PartitionedRegionHelper.java | 1 - .../cache/PartitionedRegionQueryEvaluator.java | 3 - .../internal/cache/PartitionedRegionStats.java | 5 - .../geode/internal/cache/PersistentOplogSet.java | 1 - .../geode/internal/cache/PoolManagerImpl.java | 3 - .../internal/cache/ProfileExchangeProcessor.java | 1 - .../geode/internal/cache/RegionEventImpl.java | 13 - .../geode/internal/cache/RegionExpiryTask.java | 1 - .../geode/internal/cache/RegionIdleExpiryTask.java | 3 - .../apache/geode/internal/cache/RegionQueue.java | 14 - .../geode/internal/cache/RegionTTLExpiryTask.java | 3 - .../cache/SearchLoadAndWriteProcessor.java | 1 - .../cache/StoreAllCachedDeserializable.java | 3 - .../geode/internal/cache/TXBucketRegionState.java | 3 - .../org/apache/geode/internal/cache/TXEntry.java | 3 - .../geode/internal/cache/TXEntryStateFactory.java | 4 - .../geode/internal/cache/TXStateInterface.java | 6 - .../apache/geode/internal/cache/TXStateProxy.java | 2 - .../geode/internal/cache/TXStateProxyImpl.java | 2 - .../geode/internal/cache/TransactionMessage.java | 3 - .../geode/internal/cache/TxEntryFactory.java | 4 - .../cache/UpdateEntryVersionOperation.java | 3 - .../internal/cache/VMCachedDeserializable.java | 2 - .../geode/internal/cache/VersionTimestamp.java | 3 - .../protocol/ClientProtocolServiceLoader.java | 1 - .../geode/internal/cache/control/FilterByPath.java | 3 - .../cache/control/InternalResourceManager.java | 6 - .../geode/internal/cache/control/MemoryEvent.java | 2 - .../internal/cache/control/MemoryThresholds.java | 2 - .../geode/internal/cache/control/RegionFilter.java | 3 - .../internal/cache/control/ResourceEvent.java | 3 - .../cache/entries/AbstractDiskRegionEntry.java | 2 - .../internal/cache/entries/OffHeapRegionEntry.java | 1 - .../entries/VMStatsDiskRegionEntryHeapIntKey.java | 1 - .../entries/VMStatsDiskRegionEntryHeapLongKey.java | 1 - .../VMStatsDiskRegionEntryHeapObjectKey.java | 1 - .../VMStatsDiskRegionEntryHeapStringKey1.java | 1 - .../VMStatsDiskRegionEntryHeapStringKey2.java | 1 - .../entries/VMStatsDiskRegionEntryHeapUUIDKey.java | 1 - .../VMStatsDiskRegionEntryOffHeapIntKey.java | 1 - .../VMStatsDiskRegionEntryOffHeapLongKey.java | 1 - .../VMStatsDiskRegionEntryOffHeapObjectKey.java | 1 - .../VMStatsDiskRegionEntryOffHeapStringKey1.java | 1 - .../VMStatsDiskRegionEntryOffHeapStringKey2.java | 1 - .../VMStatsDiskRegionEntryOffHeapUUIDKey.java | 1 - .../entries/VMStatsLRURegionEntryHeapIntKey.java | 1 - .../entries/VMStatsLRURegionEntryHeapLongKey.java | 1 - .../VMStatsLRURegionEntryHeapObjectKey.java | 1 - .../VMStatsLRURegionEntryHeapStringKey1.java | 1 - .../VMStatsLRURegionEntryHeapStringKey2.java | 1 - .../entries/VMStatsLRURegionEntryHeapUUIDKey.java | 1 - .../VMStatsLRURegionEntryOffHeapIntKey.java | 1 - .../VMStatsLRURegionEntryOffHeapLongKey.java | 1 - .../VMStatsLRURegionEntryOffHeapObjectKey.java | 1 - .../VMStatsLRURegionEntryOffHeapStringKey1.java | 1 - .../VMStatsLRURegionEntryOffHeapStringKey2.java | 1 - .../VMStatsLRURegionEntryOffHeapUUIDKey.java | 1 - .../VMThinDiskLRURegionEntryHeapIntKey.java | 1 - .../VMThinDiskLRURegionEntryHeapLongKey.java | 1 - .../VMThinDiskLRURegionEntryHeapObjectKey.java | 1 - .../VMThinDiskLRURegionEntryHeapStringKey1.java | 1 - .../VMThinDiskLRURegionEntryHeapStringKey2.java | 1 - .../VMThinDiskLRURegionEntryHeapUUIDKey.java | 1 - .../VMThinDiskLRURegionEntryOffHeapIntKey.java | 1 - .../VMThinDiskLRURegionEntryOffHeapLongKey.java | 1 - .../VMThinDiskLRURegionEntryOffHeapObjectKey.java | 1 - .../VMThinDiskLRURegionEntryOffHeapStringKey1.java | 1 - .../VMThinDiskLRURegionEntryOffHeapStringKey2.java | 1 - .../VMThinDiskLRURegionEntryOffHeapUUIDKey.java | 1 - .../entries/VMThinDiskRegionEntryHeapIntKey.java | 1 - .../entries/VMThinDiskRegionEntryHeapLongKey.java | 1 - .../VMThinDiskRegionEntryHeapObjectKey.java | 1 - .../VMThinDiskRegionEntryHeapStringKey1.java | 1 - .../VMThinDiskRegionEntryHeapStringKey2.java | 1 - .../entries/VMThinDiskRegionEntryHeapUUIDKey.java | 1 - .../VMThinDiskRegionEntryOffHeapIntKey.java | 1 - .../VMThinDiskRegionEntryOffHeapLongKey.java | 1 - .../VMThinDiskRegionEntryOffHeapObjectKey.java | 1 - .../VMThinDiskRegionEntryOffHeapStringKey1.java | 1 - .../VMThinDiskRegionEntryOffHeapStringKey2.java | 1 - .../VMThinDiskRegionEntryOffHeapUUIDKey.java | 1 - .../entries/VMThinLRURegionEntryHeapIntKey.java | 2 - .../entries/VMThinLRURegionEntryHeapLongKey.java | 2 - .../entries/VMThinLRURegionEntryHeapObjectKey.java | 2 - .../VMThinLRURegionEntryHeapStringKey1.java | 2 - .../VMThinLRURegionEntryHeapStringKey2.java | 2 - .../entries/VMThinLRURegionEntryHeapUUIDKey.java | 2 - .../entries/VMThinLRURegionEntryOffHeapIntKey.java | 2 - .../VMThinLRURegionEntryOffHeapLongKey.java | 2 - .../VMThinLRURegionEntryOffHeapObjectKey.java | 2 - .../VMThinLRURegionEntryOffHeapStringKey1.java | 2 - .../VMThinLRURegionEntryOffHeapStringKey2.java | 2 - .../VMThinLRURegionEntryOffHeapUUIDKey.java | 2 - .../entries/VersionedStatsDiskLRURegionEntry.java | 3 - .../entries/VersionedStatsDiskRegionEntry.java | 3 - .../VersionedStatsDiskRegionEntryHeapIntKey.java | 1 - .../VersionedStatsDiskRegionEntryHeapLongKey.java | 1 - ...VersionedStatsDiskRegionEntryHeapObjectKey.java | 1 - ...ersionedStatsDiskRegionEntryHeapStringKey1.java | 1 - ...ersionedStatsDiskRegionEntryHeapStringKey2.java | 1 - .../VersionedStatsDiskRegionEntryHeapUUIDKey.java | 1 - ...VersionedStatsDiskRegionEntryOffHeapIntKey.java | 1 - ...ersionedStatsDiskRegionEntryOffHeapLongKey.java | 1 - ...sionedStatsDiskRegionEntryOffHeapObjectKey.java | 1 - ...ionedStatsDiskRegionEntryOffHeapStringKey1.java | 1 - ...ionedStatsDiskRegionEntryOffHeapStringKey2.java | 1 - ...ersionedStatsDiskRegionEntryOffHeapUUIDKey.java | 1 - .../entries/VersionedStatsLRURegionEntry.java | 3 - .../entries/VersionedThinDiskLRURegionEntry.java | 3 - .../VersionedThinDiskLRURegionEntryHeapIntKey.java | 1 - ...VersionedThinDiskLRURegionEntryHeapLongKey.java | 1 - ...rsionedThinDiskLRURegionEntryHeapObjectKey.java | 1 - ...sionedThinDiskLRURegionEntryHeapStringKey1.java | 1 - ...sionedThinDiskLRURegionEntryHeapStringKey2.java | 1 - ...VersionedThinDiskLRURegionEntryHeapUUIDKey.java | 1 - ...rsionedThinDiskLRURegionEntryOffHeapIntKey.java | 1 - ...sionedThinDiskLRURegionEntryOffHeapLongKey.java | 1 - ...onedThinDiskLRURegionEntryOffHeapObjectKey.java | 1 - ...nedThinDiskLRURegionEntryOffHeapStringKey1.java | 1 - ...nedThinDiskLRURegionEntryOffHeapStringKey2.java | 1 - ...sionedThinDiskLRURegionEntryOffHeapUUIDKey.java | 1 - .../VersionedThinDiskRegionEntryHeapIntKey.java | 1 - .../VersionedThinDiskRegionEntryHeapLongKey.java | 1 - .../VersionedThinDiskRegionEntryHeapObjectKey.java | 1 - ...VersionedThinDiskRegionEntryHeapStringKey1.java | 1 - ...VersionedThinDiskRegionEntryHeapStringKey2.java | 1 - .../VersionedThinDiskRegionEntryHeapUUIDKey.java | 1 - .../VersionedThinDiskRegionEntryOffHeapIntKey.java | 1 - ...VersionedThinDiskRegionEntryOffHeapLongKey.java | 1 - ...rsionedThinDiskRegionEntryOffHeapObjectKey.java | 1 - ...sionedThinDiskRegionEntryOffHeapStringKey1.java | 1 - ...sionedThinDiskRegionEntryOffHeapStringKey2.java | 1 - ...VersionedThinDiskRegionEntryOffHeapUUIDKey.java | 1 - .../VersionedThinLRURegionEntryHeapIntKey.java | 1 - .../VersionedThinLRURegionEntryHeapLongKey.java | 1 - .../VersionedThinLRURegionEntryHeapObjectKey.java | 1 - .../VersionedThinLRURegionEntryHeapStringKey1.java | 1 - .../VersionedThinLRURegionEntryHeapStringKey2.java | 1 - .../VersionedThinLRURegionEntryHeapUUIDKey.java | 1 - .../VersionedThinLRURegionEntryOffHeapIntKey.java | 1 - .../VersionedThinLRURegionEntryOffHeapLongKey.java | 1 - ...ersionedThinLRURegionEntryOffHeapObjectKey.java | 1 - ...rsionedThinLRURegionEntryOffHeapStringKey1.java | 1 - ...rsionedThinLRURegionEntryOffHeapStringKey2.java | 1 - .../VersionedThinLRURegionEntryOffHeapUUIDKey.java | 1 - .../cache/entries/VersionedThinRegionEntry.java | 3 - .../cache/eviction/AbstractEvictionController.java | 1 - .../internal/cache/eviction/CountLRUEviction.java | 1 - .../geode/internal/cache/eviction/LIFOList.java | 1 - .../cache/eviction/MemoryLRUController.java | 1 - .../internal/cache/execute/AbstractExecution.java | 1 - .../cache/execute/BucketMovedException.java | 4 - .../cache/execute/DefaultResultCollector.java | 2 - .../DistributedRegionFunctionResultSender.java | 2 - .../DistributedRegionFunctionResultWaiter.java | 4 - .../cache/execute/FunctionExecutionNodePruner.java | 4 - .../cache/execute/FunctionServiceStats.java | 1 - .../internal/cache/execute/FunctionStats.java | 1 - .../execute/FunctionStreamingResultCollector.java | 4 - .../internal/cache/execute/InternalExecution.java | 1 - .../cache/execute/InternalFunctionException.java | 5 - .../cache/execute/InternalFunctionService.java | 7 - .../cache/execute/InternalResultSender.java | 4 - .../cache/execute/MemberFunctionResultSender.java | 8 - .../cache/execute/MemberFunctionResultWaiter.java | 4 - .../execute/MultiRegionFunctionResultWaiter.java | 4 - .../PartitionedRegionFunctionResultSender.java | 8 - .../cache/execute/ServerFunctionExecutor.java | 5 - .../execute/ServerRegionFunctionExecutor.java | 1 - .../ServerToClientFunctionResultSender.java | 2 - .../cache/execute/StreamingFunctionOperation.java | 2 - .../util/FindRestEnabledServersFunction.java | 1 - .../geode/internal/cache/ha/HAContainerMap.java | 8 - .../geode/internal/cache/ha/HAContainerRegion.java | 2 - .../geode/internal/cache/ha/HARegionQueue.java | 3 - .../internal/cache/ha/HARegionQueueAttributes.java | 6 - .../geode/internal/cache/ha/ThreadIdentifier.java | 6 - .../cache/partitioned/ColocatedRegionDetails.java | 4 - .../cache/partitioned/CreateBucketMessage.java | 1 - .../internal/cache/partitioned/DestroyMessage.java | 1 - .../partitioned/EndBucketCreationMessage.java | 1 - .../cache/partitioned/FetchBulkEntriesMessage.java | 1 - .../cache/partitioned/FetchKeysMessage.java | 5 - .../partitioned/FetchPartitionDetailsMessage.java | 2 - .../internal/cache/partitioned/FlushMessage.java | 3 - .../internal/cache/partitioned/GetMessage.java | 3 - .../cache/partitioned/IdentityRequestMessage.java | 1 - .../cache/partitioned/IndexCreationMsg.java | 1 - .../cache/partitioned/InvalidateMessage.java | 2 - .../partitioned/ManageBackupBucketMessage.java | 2 - .../cache/partitioned/ManageBucketMessage.java | 1 - .../cache/partitioned/OfflineMemberDetails.java | 3 - .../partitioned/OfflineMemberDetailsImpl.java | 3 - .../partitioned/PRUpdateEntryVersionMessage.java | 12 - .../PartitionMessageWithDirectReply.java | 3 - .../PartitionedRegionObserverAdapter.java | 1 - .../partitioned/PartitionedRegionRebalanceOp.java | 2 - .../internal/cache/partitioned/PutMessage.java | 2 - .../cache/partitioned/RecoveryRunnable.java | 3 - .../partitioned/RedundancyAlreadyMetException.java | 3 - .../cache/partitioned/RedundancyLogger.java | 1 - .../internal/cache/partitioned/RegionAdvisor.java | 6 - .../cache/partitioned/RemoveIndexesMessage.java | 1 - .../partitioned/StreamingPartitionOperation.java | 3 - .../cache/partitioned/rebalance/model/Member.java | 1 - .../model/PartitionedRegionLoadModel.java | 2 - .../cache/persistence/CanonicalIdHolder.java | 1 - .../cache/persistence/DiskInitFileInterpreter.java | 59 -- .../cache/persistence/DiskInitFileParser.java | 3 - .../internal/cache/persistence/DiskStoreID.java | 4 - .../cache/persistence/MembershipFlushRequest.java | 3 - .../cache/persistence/MembershipViewRequest.java | 3 - .../cache/persistence/PRPersistentConfig.java | 3 - .../cache/persistence/PersistenceAdvisor.java | 5 - .../cache/persistence/PersistenceAdvisorImpl.java | 3 - .../cache/persistence/PersistentMemberID.java | 4 - .../cache/persistence/PersistentMemberManager.java | 3 - .../cache/persistence/PersistentMemberState.java | 3 - .../cache/persistence/PersistentMemberView.java | 1 - .../persistence/PersistentStateQueryMessage.java | 3 - .../persistence/PersistentStateQueryResults.java | 1 - .../PrepareNewPersistentMemberMessage.java | 3 - .../persistence/RemovePersistentMemberMessage.java | 3 - .../geode/internal/cache/snapshot/GFSnapshot.java | 2 - .../cache/snapshot/ParallelSnapshotFileMapper.java | 2 - .../cache/snapshot/RegionSnapshotServiceImpl.java | 1 - .../cache/snapshot/SnapshotFileMapper.java | 2 - .../internal/cache/snapshot/SnapshotPacket.java | 2 - .../apache/geode/internal/cache/tier/Acceptor.java | 8 - .../geode/internal/cache/tier/ConnectionProxy.java | 2 +- .../cache/tier/sockets/CacheClientNotifier.java | 1 - .../cache/tier/sockets/CacheClientProxy.java | 4 - .../cache/tier/sockets/CacheServerHelper.java | 4 - .../cache/tier/sockets/CacheServerStats.java | 3 - .../tier/sockets/ClientDataSerializerMessage.java | 7 +- .../cache/tier/sockets/ClientHealthMonitor.java | 1 - .../tier/sockets/ClientInterestMessageImpl.java | 1 - .../internal/cache/tier/sockets/ClientMessage.java | 1 - .../cache/tier/sockets/ClientTombstoneMessage.java | 7 +- .../tier/sockets/ClientUpdateMessageImpl.java | 6 - .../cache/tier/sockets/CommandInitializer.java | 99 +-- .../cache/tier/sockets/HAEventWrapper.java | 4 - .../geode/internal/cache/tier/sockets/Message.java | 1 - .../cache/tier/sockets/MessageIdExtractor.java | 1 - .../cache/tier/sockets/ObjectPartList651.java | 7 - .../tier/sockets/OldClientSupportService.java | 1 - .../tier/sockets/OriginalServerConnection.java | 10 - .../tier/sockets/ProtobufServerConnection.java | 8 +- .../tier/sockets/SerializedObjectPartList.java | 3 - .../cache/tier/sockets/ServerConnection.java | 1 - .../tier/sockets/ServerSideHandshakeFactory.java | 3 +- .../cache/tier/sockets/VersionedObjectList.java | 5 - .../cache/tier/sockets/command/AddPdxType.java | 1 - .../cache/tier/sockets/command/ClearRegion.java | 3 - .../cache/tier/sockets/command/ClientReady.java | 3 - .../tier/sockets/command/CloseConnection.java | 3 - .../cache/tier/sockets/command/CommitCommand.java | 3 - .../cache/tier/sockets/command/Default.java | 3 - .../cache/tier/sockets/command/Destroy70.java | 6 - .../tier/sockets/command/ExecuteFunction70.java | 3 - .../sockets/command/GatewayReceiverCommand.java | 1 - .../tier/sockets/command/GetPDXIdForType.java | 1 - .../cache/tier/sockets/command/Invalid.java | 3 - .../cache/tier/sockets/command/Invalidate70.java | 3 - .../cache/tier/sockets/command/KeySet.java | 3 - .../cache/tier/sockets/command/MakePrimary.java | 3 - .../cache/tier/sockets/command/PeriodicAck.java | 3 - .../internal/cache/tier/sockets/command/Ping.java | 3 - .../internal/cache/tier/sockets/command/Put70.java | 7 - .../cache/tier/sockets/command/QueryGeode10.java | 5 - .../command/QueryWithParametersGeode10.java | 3 - .../sockets/command/RegisterInstantiators.java | 3 - .../tier/sockets/command/RegisterInterest.java | 3 - .../tier/sockets/command/RegisterInterest61.java | 7 + .../sockets/command/UnregisterInterestList.java | 3 - .../cache/tx/AbstractPeerTXRegionStub.java | 1 - .../geode/internal/cache/tx/DistTxEntryEvent.java | 18 - .../internal/cache/tx/PartitionedTXRegionStub.java | 1 - .../internal/cache/tx/RemoteFetchKeysMessage.java | 6 - .../cache/tx/RemoteFetchVersionMessage.java | 3 - .../geode/internal/cache/tx/RemoteGetMessage.java | 1 - .../geode/internal/cache/tx/RemotePutMessage.java | 6 +- .../internal/cache/tx/TransactionalOperation.java | 4 - .../ConcurrentCacheModificationException.java | 3 - .../cache/versions/RegionVersionHolder.java | 2 - .../cache/versions/RegionVersionVector.java | 13 - .../geode/internal/cache/versions/VersionTag.java | 4 - .../internal/cache/wan/AbstractGatewaySender.java | 22 +- .../wan/AbstractGatewaySenderEventProcessor.java | 55 +- .../geode/internal/cache/wan/BatchException70.java | 1 - .../internal/cache/wan/GatewayEventFilterImpl.java | 1 - .../wan/GatewaySenderConfigurationException.java | 3 - .../wan/GatewaySenderEventCallbackArgument.java | 2 - .../wan/GatewaySenderEventCallbackDispatcher.java | 1 - .../internal/cache/wan/GatewaySenderEventImpl.java | 3 - .../internal/cache/wan/GatewaySenderStats.java | 77 ++ .../internal/cache/wan/TransportFilterSocket.java | 1 - .../cache/wan/TransportFilterSocketFactory.java | 1 - .../ConcurrentParallelGatewaySenderQueue.java | 29 +- .../ParallelGatewaySenderEventProcessor.java | 1 - .../wan/parallel/ParallelGatewaySenderQueue.java | 33 +- .../wan/parallel/ParallelQueueRemovalMessage.java | 3 + ...oncurrentSerialGatewaySenderEventProcessor.java | 10 - .../cache/wan/serial/SerialGatewaySenderQueue.java | 9 - .../internal/cache/xmlcache/BindingCreation.java | 2 - .../cache/xmlcache/CacheServerCreation.java | 3 - .../geode/internal/cache/xmlcache/CacheXml.java | 27 - .../internal/cache/xmlcache/CacheXmlGenerator.java | 4 - .../internal/cache/xmlcache/CacheXmlParser.java | 12 - .../cache/xmlcache/CacheXmlPropertyResolver.java | 9 - .../xmlcache/CacheXmlPropertyResolverHelper.java | 9 - .../cache/xmlcache/ClientCacheCreation.java | 1 - .../xmlcache/DiskStoreAttributesCreation.java | 5 - .../cache/xmlcache/GatewayReceiverCreation.java | 4 - .../internal/cache/xmlcache/PropertyResolver.java | 5 - .../cache/xmlcache/RegionAttributesCreation.java | 5 - .../internal/cache/xmlcache/RegionCreation.java | 11 - .../cache/xmlcache/SerializerCreation.java | 10 - .../internal/cache/xmlcache/XmlGenerator.java | 1 - .../org/apache/geode/internal/concurrent/AL.java | 1 - .../apache/geode/internal/config/JAXBService.java | 138 ++++ .../internal/datasource/AbstractDataSource.java | 20 - .../internal/datasource/AbstractPoolCache.java | 9 +- .../datasource/ConfiguredDataSourceProperties.java | 15 - .../internal/datasource/ConnectionPoolCache.java | 1 - .../datasource/ConnectionPoolCacheImpl.java | 3 - .../datasource/ConnectionProviderException.java | 3 - .../datasource/DataSourceCreateException.java | 3 - .../internal/datasource/DataSourceFactory.java | 7 - .../internal/datasource/DataSourceResources.java | 2 - .../datasource/FacetsJCAConnectionManagerImpl.java | 1 - .../datasource/GemFireBasicDataSource.java | 8 - .../datasource/GemFireConnPooledDataSource.java | 7 - .../datasource/GemFireConnectionPoolManager.java | 4 - .../datasource/GemFireTransactionDataSource.java | 12 - .../datasource/JCAConnectionManagerImpl.java | 1 - .../internal/datasource/ManagedPoolCacheImpl.java | 3 - .../geode/internal/datasource/PoolException.java | 3 - .../internal/datasource/TranxPoolCacheImpl.java | 5 - .../apache/geode/internal/hll/HyperLogLogPlus.java | 4 - .../apache/geode/internal/hll/ICardinality.java | 1 - .../internal/jndi/InitialContextFactoryImpl.java | 1 - .../apache/geode/internal/jndi/JNDIInvoker.java | 2 - .../geode/internal/jta/GlobalTransaction.java | 2 - .../geode/internal/jta/TransactionUtils.java | 2 - .../geode/internal/logging/LoggingThreadGroup.java | 1 - .../geode/internal/memcached/CommandProcessor.java | 6 - .../geode/internal/memcached/ValueWrapper.java | 1 - .../internal/memcached/commands/AddQCommand.java | 4 - .../memcached/commands/AppendQCommand.java | 3 - .../memcached/commands/DecrementCommand.java | 1 - .../memcached/commands/DecrementQCommand.java | 3 - .../memcached/commands/DeleteQCommand.java | 3 - .../memcached/commands/FlushAllQCommand.java | 3 - .../internal/memcached/commands/GATCommand.java | 3 - .../internal/memcached/commands/GATQCommand.java | 3 - .../internal/memcached/commands/GetKCommand.java | 3 - .../internal/memcached/commands/GetKQCommand.java | 4 - .../internal/memcached/commands/GetQCommand.java | 6 - .../memcached/commands/IncrementQCommand.java | 3 - .../internal/memcached/commands/NoOpCommand.java | 3 - .../memcached/commands/NotSupportedCommand.java | 3 - .../memcached/commands/PrependQCommand.java | 3 - .../internal/memcached/commands/QuitQCommand.java | 3 - .../memcached/commands/ReplaceQCommand.java | 3 - .../internal/memcached/commands/SetQCommand.java | 4 - .../memcached/commands/StorageCommand.java | 6 - .../internal/memcached/commands/TouchCommand.java | 3 - .../apache/geode/internal/net/SocketCreator.java | 11 - .../geode/internal/net/SocketCreatorFactory.java | 5 - .../geode/internal/offheap/OffHeapHelper.java | 1 - .../geode/internal/offheap/RefCountChangeInfo.java | 1 - .../geode/internal/offheap/StoredObject.java | 2 - .../geode/internal/sequencelog/GraphType.java | 3 - .../internal/sequencelog/MembershipLogger.java | 3 - .../geode/internal/sequencelog/MessageLogger.java | 3 - .../geode/internal/sequencelog/RegionLogger.java | 2 - .../internal/sequencelog/SequenceLoggerImpl.java | 3 - .../geode/internal/sequencelog/Transition.java | 3 - .../geode/internal/sequencelog/io/Filter.java | 3 - .../sequencelog/io/GemfireLogConverter.java | 7 - .../geode/internal/sequencelog/io/GraphReader.java | 3 - .../internal/sequencelog/io/InputStreamReader.java | 4 - .../geode/internal/sequencelog/model/Graph.java | 5 - .../geode/internal/sequencelog/model/GraphID.java | 3 - .../sequencelog/model/GraphReaderCallback.java | 3 - .../geode/internal/sequencelog/model/GraphSet.java | 3 - .../geode/internal/sequencelog/model/Vertex.java | 3 - .../visualization/text/TextDisplay.java | 7 - .../apache/geode/internal/shared/NativeCalls.java | 1 - .../geode/internal/shared/NativeCallsJNAImpl.java | 1 - .../internal/size/CachingSingleObjectSizer.java | 4 - .../geode/internal/size/ObjectTraverser.java | 2 - .../geode/internal/size/SingleObjectSizer.java | 1 - .../internal/statistics/LocalStatisticsImpl.java | 3 - .../internal/statistics/StatArchiveHandler.java | 7 - .../statistics/platform/LinuxProcessStats.java | 1 - .../statistics/platform/SolarisProcessStats.java | 1 - .../statistics/platform/WindowsProcessStats.java | 1 - .../org/apache/geode/internal/tcp/Buffers.java | 3 - .../apache/geode/internal/tcp/ConnectionTable.java | 5 - .../org/apache/geode/internal/tcp/MsgReader.java | 3 - .../org/apache/geode/internal/tcp/MsgStreamer.java | 3 - .../apache/geode/internal/util/LogFileUtils.java | 3 - .../apache/geode/internal/util/PluckStacks.java | 2 - .../geode/internal/util/VersionedArrayList.java | 9 - .../util/concurrent/ReentrantSemaphore.java | 3 - .../util/concurrent/StoppableCondition.java | 2 - .../util/concurrent/StoppableCountDownLatch.java | 3 - .../util/concurrent/StoppableReentrantLock.java | 4 - .../StoppableReentrantReadWriteLock.java | 11 - .../geode/management/AsyncEventQueueMXBean.java | 1 - .../apache/geode/management/CacheServerMXBean.java | 3 - .../geode/management/DistributedSystemMXBean.java | 1 - .../org/apache/geode/management/JVMMetrics.java | 1 - .../apache/geode/management/NetworkMetrics.java | 1 - .../apache/geode/management/cli/GfshCommand.java | 11 + .../management/internal/FederationComponent.java | 6 - .../management/internal/JmxManagerAdvisor.java | 4 - .../geode/management/internal/MBeanJMXAdapter.java | 15 - .../internal/MBeanProxyInfoRepository.java | 4 - .../internal/MBeanProxyInvocationHandler.java | 9 - .../internal/MXBeanProxyInvocationHandler.java | 1 - .../management/internal/ManagementFunction.java | 1 - .../internal/NotificationBroadCasterProxy.java | 1 - .../internal/NotificationCacheListener.java | 1 - .../geode/management/internal/NotificationHub.java | 2 - .../management/internal/NotificationHubClient.java | 1 - .../geode/management/internal/OpenMethod.java | 1 - .../geode/management/internal/ProxyInfo.java | 4 - .../geode/management/internal/ProxyInterface.java | 1 - .../geode/management/internal/ProxyListener.java | 1 - .../management/internal/StringBasedFilter.java | 7 - .../internal/beans/AsyncEventQueueMBean.java | 1 - .../internal/beans/CacheServerBridge.java | 4 - .../internal/beans/DiskRegionBridge.java | 4 - .../management/internal/beans/FileUploader.java | 6 - .../internal/beans/GatewayReceiverMBean.java | 4 - .../internal/beans/GatewayReceiverMBeanBridge.java | 4 - .../management/internal/beans/LocatorMBean.java | 4 - .../internal/beans/LocatorMBeanBridge.java | 1 - .../management/internal/beans/MBeanAggregator.java | 1 - .../internal/beans/ManagementAdapter.java | 10 - .../management/internal/beans/ManagerMBean.java | 4 - .../internal/beans/MetricsCalculator.java | 1 - .../internal/beans/PartitionedRegionBridge.java | 4 - .../internal/beans/RegionMBeanBridge.java | 11 - .../beans/stats/AggregateRegionStatsMonitor.java | 5 - .../internal/beans/stats/GCStatsMonitor.java | 5 - .../stats/GatewayReceiverClusterStatsMonitor.java | 4 - .../stats/GatewaySenderClusterStatsMonitor.java | 4 - .../beans/stats/MemberClusterStatsMonitor.java | 4 - .../beans/stats/MemberLevelDiskMonitor.java | 6 - .../beans/stats/ServerClusterStatsMonitor.java | 4 - .../management/internal/beans/stats/StatType.java | 4 - .../internal/beans/stats/StatsAggregator.java | 4 - .../internal/beans/stats/StatsAverageLatency.java | 4 - .../internal/beans/stats/StatsLatency.java | 4 - .../management/internal/beans/stats/StatsRate.java | 5 - .../geode/management/internal/cli/CliUtil.java | 1 - .../geode/management/internal/cli/GfshParser.java | 2 - .../cli/commands/CommandAvailabilityIndicator.java | 20 +- .../internal/cli/commands/ConfigurePDXCommand.java | 5 - .../cli/commands/CreateGatewayReceiverCommand.java | 20 +- .../cli/commands/CreateJndiBindingCommand.java | 20 +- .../cli/commands/DescribeJndiBindingCommand.java | 4 + .../cli/commands/DestroyJndiBindingCommand.java | 6 +- .../ExportImportClusterConfigurationCommands.java | 18 +- .../cli/commands/ExportStackTraceCommand.java | 1 - .../internal/cli/commands/InternalGfshCommand.java | 1 - .../internal/cli/commands/ListGatewayCommand.java | 7 +- .../cli/commands/ListJndiBindingCommand.java | 2 +- .../cli/commands/ShowMetricsInterceptor.java | 2 - .../internal/cli/commands/StartLocatorCommand.java | 6 + .../cli/commands/dto/RegionAttributesInfo.java | 162 ---- .../internal/cli/commands/dto/RegionDetails.java | 245 ------ .../cli/commands/dto/RegionMemberDetails.java | 205 ----- .../converters/ConnectionEndpointConverter.java | 6 - .../cli/converters/DiskStoreNameConverter.java | 5 - .../cli/converters/GatewaySenderIdConverter.java | 5 - .../cli/converters/LocatorIdNameConverter.java | 5 - .../internal/cli/domain/DataCommandRequest.java | 4 - .../cli/domain/EvictionAttributesInfo.java | 4 - .../cli/domain/FixedPartitionAttributesInfo.java | 4 - .../management/internal/cli/domain/IndexInfo.java | 2 - .../internal/cli/domain/MemberInformation.java | 3 - .../cli/domain/PartitionAttributesInfo.java | 4 - .../internal/cli/functions/CliFunctionResult.java | 60 +- .../cli/functions/DestroyIndexFunction.java | 2 - .../functions/GatewayReceiverCreateFunction.java | 36 +- .../cli/functions/GatewayReceiverFunctionArgs.java | 8 +- .../cli/functions/GatewaySenderCreateFunction.java | 3 - .../GetMemberConfigInformationFunction.java | 6 - .../functions/GetMemberInformationFunction.java | 3 - .../cli/functions/RegionAlterFunction.java | 37 +- .../management/internal/cli/help/HelpBlock.java | 3 - .../management/internal/cli/i18n/CliStrings.java | 5 +- .../management/internal/cli/json/GfJsonArray.java | 23 - .../management/internal/cli/json/GfJsonObject.java | 42 +- .../internal/cli/result/AbstractResultData.java | 7 - .../internal/cli/result/CliJsonSerializable.java | 42 - .../cli/result/CliJsonSerializableFactory.java | 46 -- .../cli/result/CliJsonSerializableIds.java | 29 - .../internal/cli/result/CommandResult.java | 234 ++---- .../internal/cli/result/CompositeResultData.java | 2 - .../internal/cli/result/ErrorResultData.java | 5 - .../internal/cli/result/ObjectResultData.java | 86 --- .../internal/cli/result/ResultBuilder.java | 53 +- .../management/internal/cli/result/ResultData.java | 1 - .../internal/cli/result/ResultDataException.java | 3 - .../internal/cli/result/TableBuilderHelper.java | 1 - .../internal/cli/shell/JmxOperationInvoker.java | 5 - .../internal/cli/shell/jline/ANSIHandler.java | 1 - .../cli/shell/jline/CygwinMinttyTerminal.java | 2 - .../internal/cli/util/ConnectionEndpoint.java | 11 - .../internal/cli/util/DiskStoreCompacter.java | 1 - .../internal/cli/util/DiskStoreUpgrader.java | 1 - .../internal/cli/util/DiskStoreValidater.java | 3 - .../internal/cli/util/EvictionAttributesInfo.java | 5 - .../internal/cli/util/HyphenFormatter.java | 1 - .../management/internal/cli/util/JsonUtil.java | 52 -- .../management/internal/cli/util/LogFilter.java | 2 - .../internal/cli/util/MemberInformation.java | 3 - .../internal/cli/util/ReadWriteFile.java | 3 - .../configuration/domain/CacheElement.java | 10 - .../configuration/domain/Configuration.java | 3 - .../internal/configuration/domain/XmlEntity.java | 2 - .../functions/GetClusterConfigurationFunction.java | 40 +- .../messages/SharedConfigurationStatusRequest.java | 4 - .../SharedConfigurationStatusResponse.java | 7 - .../internal/configuration/utils/XmlUtils.java | 44 -- .../internal/configuration/utils/ZipUtils.java | 3 - .../support/LoginHandlerInterceptor.java | 1 - .../geode/memcached/GemFireMemcachedServer.java | 4 - .../geode/pdx/PdxConfigurationException.java | 3 - .../geode/pdx/PdxFieldAlreadyExistsException.java | 3 - .../geode/pdx/PdxFieldDoesNotExistException.java | 3 - .../geode/pdx/PdxFieldTypeMismatchException.java | 3 - .../geode/pdx/PdxInitializationException.java | 3 - .../geode/pdx/PdxSerializationException.java | 3 - .../java/org/apache/geode/pdx/PdxUnreadFields.java | 3 - .../pdx/internal/AutoSerializableManager.java | 2 - .../geode/pdx/internal/ClientTypeRegistration.java | 1 - .../apache/geode/pdx/internal/DefaultPdxField.java | 1 - .../apache/geode/pdx/internal/PdxInputStream.java | 3 - .../apache/geode/pdx/internal/PdxInstanceEnum.java | 2 - .../geode/pdx/internal/PdxInstanceFactoryImpl.java | 1 - .../apache/geode/pdx/internal/PdxOutputStream.java | 10 - .../org/apache/geode/pdx/internal/PdxType.java | 3 - .../geode/pdx/internal/PeerTypeRegistration.java | 3 - .../geode/pdx/internal/TrackingPdxReaderImpl.java | 1 - .../internal/WeakConcurrentIdentityHashMap.java | 1 - .../org/apache/geode/redis/GeodeRedisServer.java | 3 - .../geode/redis/internal/ByteArrayWrapper.java | 1 - .../redis/internal/ExecutionHandlerContext.java | 7 +- .../org/apache/geode/security/AuthInitialize.java | 1 - .../org/apache/geode/security/SecurityManager.java | 1 - .../sanctioned-geode-core-serializables.txt | 2 +- .../java/batterytest/greplogs/ExpectedStrings.java | 6 - .../test/java/org/apache/geode/TXJUnitTest.java | 6 - .../java/org/apache/geode/TestDataSerializer.java | 6 - .../geode/cache/ConnectionPoolDUnitTest.java | 5 - .../org/apache/geode/cache/ProxyJUnitTest.java | 2 + .../apache/geode/cache/RegionFactoryJUnitTest.java | 1 - .../SerialAsyncEventQueueImplJUnitTest.java | 3 + .../cache/client/ClientCacheFactoryJUnitTest.java | 86 ++- .../AutoConnectionSourceImplJUnitTest.java | 5 - .../internal/ConnectionPoolImplJUnitTest.java | 3 - .../internal/LocatorLoadBalancingDUnitTest.java | 8 - .../cache/client/internal/LocatorTestBase.java | 3 - .../client/internal/QueueManagerJUnitTest.java | 3 - .../pooling/ConnectionManagerJUnitTest.java | 4 - .../cache/execute/FunctionAdapterJUnitTest.java | 6 - .../management/MXMemoryPoolListenerExample.java | 6 - .../management/MemoryThresholdsDUnitTest.java | 8 - .../MemoryThresholdsOffHeapDUnitTest.java | 1 - .../partition/PartitionRegionHelperDUnitTest.java | 3 - .../org/apache/geode/cache/query/PerfQuery.java | 3 - .../apache/geode/cache/query/QueryJUnitTest.java | 3 - .../geode/cache/query/QueryServiceJUnitTest.java | 3 - .../apache/geode/cache/query/QueryTestUtils.java | 6 - .../geode/cache/query/TypedIteratorJUnitTest.java | 3 - .../java/org/apache/geode/cache/query/Utils.java | 3 - .../cache/query/cq/dunit/CqQueryTestListener.java | 7 - .../org/apache/geode/cache/query/data/City.java | 3 - .../geode/cache/query/data/CollectionHolder.java | 3 - .../geode/cache/query/data/ComparableWrapper.java | 3 - .../org/apache/geode/cache/query/data/Country.java | 3 - .../apache/geode/cache/query/data/District.java | 3 - .../org/apache/geode/cache/query/data/Numbers.java | 3 - .../geode/cache/query/data/PortfolioNoDS.java | 3 - .../geode/cache/query/data/PortfolioPdx.java | 1 - .../geode/cache/query/data/PositionNoDS.java | 3 - .../apache/geode/cache/query/data/PositionPdx.java | 2 - .../org/apache/geode/cache/query/data/Quote.java | 3 - .../apache/geode/cache/query/data/Restricted.java | 3 - .../org/apache/geode/cache/query/data/State.java | 3 - .../org/apache/geode/cache/query/data/Student.java | 4 - .../org/apache/geode/cache/query/data/Vehicle.java | 4 - .../org/apache/geode/cache/query/data/Village.java | 3 - .../cache/query/dunit/CqTimeTestListener.java | 3 - .../geode/cache/query/dunit/GroupByDUnitImpl.java | 9 - .../dunit/GroupByPartitionedQueryDUnitTest.java | 4 - .../cache/query/dunit/GroupByQueryDUnitTest.java | 4 - .../query/dunit/NonDistinctOrderByDUnitImpl.java | 4 - .../NonDistinctOrderByPartitionedDUnitTest.java | 4 - .../PdxLocalQueryVersionedClassDUnitTest.java | 1 - .../geode/cache/query/dunit/PdxQueryDUnitTest.java | 6 - .../cache/query/dunit/PositionPdxVersion.java | 1 - .../dunit/QueryDataInconsistencyDUnitTest.java | 4 - .../dunit/QueryUsingFunctionContextDUnitTest.java | 19 - .../cache/query/dunit/QueryUsingPoolDUnitTest.java | 1 - .../functional/ComparisonOperatorsJUnitTest.java | 3 - .../cache/query/functional/CountStarJUnitTest.java | 3 - ...tinctResultsWithDupValuesInRegionJUnitTest.java | 6 - .../functional/GroupByPartitionedJUnitTest.java | 4 - .../functional/GroupByReplicatedJUnitTest.java | 4 - .../functional/IUMRCompositeIteratorJUnitTest.java | 3 - .../functional/IUMRSingleRegionJUnitTest.java | 2 - ...IndependentOperandsInWhereClause2JUnitTest.java | 3 - .../query/functional/IndexCreationJUnitTest.java | 2 - .../IndexMaintenanceAsynchJUnitTest.java | 3 - .../query/functional/IndexOperatorJUnitTest.java | 3 - .../functional/IndexPrimaryKeyUsageJUnitTest.java | 3 - .../IndexUsageInNestedQueryJUnitTest.java | 3 - .../IndexWithSngleFrmAndMultCondQryJUnitTest.java | 3 - .../functional/IteratorTypeDefEmpJUnitTest.java | 3 - .../query/functional/IteratorTypeDefJUnitTest.java | 3 - .../IteratorTypeDefaultTypesJUnitTest.java | 3 - .../query/functional/LimitClauseJUnitTest.java | 8 - .../functional/LogicalOperatorsJUnitTest.java | 3 - .../functional/MultiRegionIndexUsageJUnitTest.java | 2 - .../functional/NegativeNumberQueriesJUnitTest.java | 2 - .../NonDistinctOrderByPartitionedJUnitTest.java | 4 - .../NonDistinctOrderByReplicatedJUnitTest.java | 4 - .../NonDistinctOrderByTestImplementation.java | 9 - .../query/functional/NumericQueryJUnitTest.java | 2 - .../functional/OrderByPartitionedJUnitTest.java | 4 - .../functional/OrderByTestImplementation.java | 4 - .../functional/ParameterBindingJUnitTest.java | 3 - .../functional/QRegionInterfaceJUnitTest.java | 3 - .../QueryREUpdateInProgressJUnitTest.java | 3 - .../query/functional/QueryUndefinedJUnitTest.java | 3 - .../query/functional/SelectToDateJUnitTest.java | 4 - .../functional/StructMemberAccessJUnitTest.java | 2 - .../internal/CompiledGroupBySelectJUnitTest.java | 4 - .../CompiledJunctionInternalsJUnitTest.java | 4 - .../query/internal/ExecutionContextJUnitTest.java | 4 - .../internal/ProjectionAttributeJUnitTest.java | 4 - .../cache/query/internal/QCompilerJUnitTest.java | 4 - .../QueryFromClauseCanonicalizationJUnitTest.java | 3 - .../cache/query/internal/QueryTraceJUnitTest.java | 10 - .../ResultsCollectionWrapperLimitJUnitTest.java | 3 - .../internal/StructBagLimitBehaviourJUnitTest.java | 3 - .../internal/cq/CqAttributesImplJUnitTest.java | 1 - .../AsyncIndexUpdaterThreadShutdownJUnitTest.java | 3 - .../index/AsynchIndexMaintenanceJUnitTest.java | 3 - .../CompactRangeIndexQueryIntegrationTest.java | 2 - ...ncurrentIndexInitOnOverflowRegionDUnitTest.java | 12 - ...ntIndexOperationsOnOverflowRegionDUnitTest.java | 18 - ...exUpdateWithInplaceObjectModFalseDUnitTest.java | 3 - .../ConcurrentIndexUpdateWithoutWLDUnitTest.java | 3 - .../internal/index/CopyOnReadIndexJUnitTest.java | 26 - .../index/IndexCreationInternalsJUnitTest.java | 3 - .../cache/query/internal/index/IndexJUnitTest.java | 2 - .../internal/index/IndexMaintainceJUnitTest.java | 3 - .../internal/index/IndexStatisticsJUnitTest.java | 13 - .../index/IndexTrackingQueryObserverDUnitTest.java | 7 - .../index/IndexTrackingQueryObserverJUnitTest.java | 6 - .../IndexedMergeEquiJoinScenariosJUnitTest.java | 3 - .../internal/index/MemoryIndexStoreJUnitTest.java | 1 - ...ProgRegionCreationIndexUpdateTypeJUnitTest.java | 4 - .../query/internal/types/TypeUtilsJUnitTest.java | 1 - .../partitioned/PRIndexStatisticsJUnitTest.java | 14 - .../query/partitioned/PRInvalidQueryJUnitTest.java | 3 - .../partitioned/PRQueryCacheClosedJUnitTest.java | 3 - .../query/partitioned/PRQueryDUnitHelper.java | 36 - .../cache/query/partitioned/PRQueryJUnitTest.java | 3 - .../partitioned/PRQueryNumThreadsJUnitTest.java | 3 - .../partitioned/PRQueryRegionClosedJUnitTest.java | 3 - .../PRQueryRegionDestroyedJUnitTest.java | 3 - .../geode/cache/query/transaction/Person.java | 1 - .../query/transaction/QueryAndJtaJUnitTest.java | 1 - .../cache/snapshot/ParallelSnapshotDUnitTest.java | 1 - .../StringPrefixPartitionResolverJUnitTest.java | 1 - .../apache/geode/cache30/CacheCloseDUnitTest.java | 1 - .../geode/cache30/CacheListenerTestCase.java | 4 - .../apache/geode/cache30/CacheLoaderTestCase.java | 4 - .../geode/cache30/CacheStatisticsDUnitTest.java | 1 - .../apache/geode/cache30/CacheWriterTestCase.java | 4 - .../geode/cache30/CacheXmlGeode10DUnitTest.java | 1 - .../org/apache/geode/cache30/CacheXmlTestCase.java | 2 - .../cache30/ClientRegisterInterestDUnitTest.java | 59 ++ .../geode/cache30/ClientServerCCEDUnitTest.java | 2 - .../cache30/ConcurrentLeaveDuringGIIDUnitTest.java | 2 - ...stributedNoAckAsyncOverflowRegionDUnitTest.java | 10 - .../DiskDistributedNoAckAsyncRegionDUnitTest.java | 3 - ...istributedNoAckSyncOverflowRegionDUnitTest.java | 2 - .../geode/cache30/DistAckMapMethodsDUnitTest.java | 5 - .../DistributedAckOverflowRegionCCEDUnitTest.java | 4 - ...DistributedAckPersistentRegionCCEDUnitTest.java | 3 - .../cache30/DistributedAckRegionCCEDUnitTest.java | 3 - .../DistributedMulticastRegionDUnitTest.java | 1 - .../geode/cache30/DynamicRegionDUnitTest.java | 1 - .../geode/cache30/GlobalLockingDUnitTest.java | 1 - .../geode/cache30/GlobalRegionCCEDUnitTest.java | 3 - .../cache30/LRUEvictionControllerDUnitTest.java | 2 - .../cache30/MemLRUEvictionControllerDUnitTest.java | 3 - .../geode/cache30/MultiVMRegionTestCase.java | 1 - .../geode/cache30/MyGatewayEventFilter1.java | 1 - .../geode/cache30/MyGatewayEventFilter2.java | 1 - .../PartitionedRegionCompressionDUnitTest.java | 3 - ...rtitionedRegionMembershipListenerDUnitTest.java | 4 - .../apache/geode/cache30/ReconnectDUnitTest.java | 12 +- .../cache30/ReconnectWithUDPSecurityDUnitTest.java | 1 - .../geode/cache30/RegionAttributesTestCase.java | 4 - .../cache30/RegionReliabilityDistAckDUnitTest.java | 3 - .../RegionReliabilityDistNoAckDUnitTest.java | 3 - .../cache30/RegionReliabilityGlobalDUnitTest.java | 3 - .../org/apache/geode/cache30/RegionTestCase.java | 4 - .../geode/cache30/RemoveAllMultiVmDUnitTest.java | 3 - .../ShorteningExpirationTimeRegressionTest.java | 3 - .../java/org/apache/geode/cache30/TestHeapLRU.java | 2 - .../apache/geode/cache30/TestPdxSerializer.java | 5 - .../geode/codeAnalysis/CompiledClassUtils.java | 1 - .../DistributedLockServiceDUnitTest.java | 10 - .../distributed/DistributedMemberDUnitTest.java | 2 - .../apache/geode/distributed/LocatorDUnitTest.java | 1 - .../apache/geode/distributed/LocatorJUnitTest.java | 1 - .../internal/CacheConfigIntegrationTest.java | 3 +- .../ClusterConfigurationServiceDUnitTest.java | 63 ++ .../internal/DlockAndTxlockRegressionTest.java | 1 - .../InternalClusterConfigurationServiceTest.java | 226 ++---- .../LocatorLoadSnapshotIntegrationTest.java | 1 - .../internal/membership/InternalRoleJUnitTest.java | 2 - .../membership/gms/GMSMemberJUnitTest.java | 1 - .../membership/gms/MembershipManagerHelper.java | 1 - .../gms/membership/GMSJoinLeaveJUnitTest.java | 2 - .../gms/messenger/GMSEncryptJUnitTest.java | 63 +- .../membership/gms/messenger/InterceptUDP.java | 6 - .../gms/messenger/JGroupsMessengerJUnitTest.java | 22 +- ...ackwardCompatibilitySerializationDUnitTest.java | 10 - .../internal/ClassNotFoundExceptionDUnitTest.java | 9 - ...alDataSerializerSerializationWhitelistTest.java | 1 - .../apache/geode/internal/VersionJUnitTest.java | 22 + .../remote/DistributionLocatorIdJUnitTest.java | 2 - .../cache/BucketPersistenceAdvisorTest.java | 1 - .../internal/cache/BucketRegionJUnitTest.java | 1 - .../internal/cache/BucketRegionQueueHelper.java | 3 - .../internal/cache/CacheAdvisorDUnitTest.java | 2 - .../cache/CacheServerLauncherJUnitTest.java | 2 - ...tMessagesRegionCreationAndDestroyJUnitTest.java | 1 - .../cache/ClientServerTransactionCCEDUnitTest.java | 6 - .../ClusterConfigurationLoaderIntegrationTest.java | 92 ++- .../geode/internal/cache/ColocationHelperTest.java | 8 - .../geode/internal/cache/CommitFunction.java | 1 - .../cache/ConcurrentDestroySubRegionDUnitTest.java | 8 - ...urrentFlushingAndRegionOperationsJUnitTest.java | 5 - .../internal/cache/ConcurrentMapOpsDUnitTest.java | 1 - .../cache/CustomerIDPartitionResolver.java | 3 - .../internal/cache/DeltaFaultInDUnitTest.java | 4 - .../internal/cache/DeltaPropagationDUnitTest.java | 3 - .../cache/DeltaPropagationStatsDUnitTest.java | 12 - .../geode/internal/cache/DeltaSizingDUnitTest.java | 8 - .../geode/internal/cache/DiskIFJUnitTest.java | 6 - .../DiskRandomOperationsAndRecoveryJUnitTest.java | 6 - .../geode/internal/cache/DiskRegionProperties.java | 2 - .../internal/cache/DiskRegionTestingBase.java | 1 - .../internal/cache/DiskStoreFactoryJUnitTest.java | 1 - .../internal/cache/DistributedCacheTestCase.java | 1 - ...victionAttributesMutatorImplRegressionTest.java | 73 ++ .../geode/internal/cache/FaultingInJUnitTest.java | 1 - .../cache/FilterProfileConcurrencyTest.java | 3 - .../FilterProfileNullCqBaseRegionJUnitTest.java | 1 - .../internal/cache/FixedPRSinglehopDUnitTest.java | 3 - .../geode/internal/cache/GIIDeltaDUnitTest.java | 8 - .../internal/cache/GIIFlowControlDUnitTest.java | 6 - .../cache/HAOverflowMemObjectSizerDUnitTest.java | 4 - .../cache/InterruptClientServerDUnitTest.java | 1 - .../geode/internal/cache/InterruptsDUnitTest.java | 1 - .../geode/internal/cache/IteratorDUnitTest.java | 8 - .../cache/JtaBeforeCompletionMessageTest.java | 1 - .../LIFOEvictionAlgoEnabledRegionJUnitTest.java | 1 - .../LRUClearWithDiskRegionOpRegressionTest.java | 6 - .../geode/internal/cache/LocalDataSetTest.java | 2 - .../internal/cache/MapInterface2JUnitTest.java | 4 - .../internal/cache/NestedTransactionFunction.java | 1 - .../geode/internal/cache/OplogJUnitTest.java | 2 - .../geode/internal/cache/PRBadToDataDUnitTest.java | 3 - .../PRQueryWithIndexAndPdxDistributedTest.java | 3 +- .../cache/PRQueryWithIndexDistributedTest.java | 3 +- .../cache/PRQueryWithOrderByDistributedTest.java | 3 +- ...RQueryWithPdxDuringRebalanceRegressionTest.java | 3 +- .../PRWithIndexAfterRebalanceRegressionTest.java | 3 +- .../cache/PartitionAttributesImplJUnitTest.java | 1 - .../cache/PartitionedRegionCreationJUnitTest.java | 2 - .../PartitionedRegionDelayedRecoveryDUnitTest.java | 2 - .../PartitionedRegionEntryCountDUnitTest.java | 2 - .../PartitionedRegionInvalidateDUnitTest.java | 5 - .../cache/PartitionedRegionQueryEvaluatorTest.java | 1 - ...nedRegionSingleHopWithServerGroupDUnitTest.java | 3 - .../cache/PartitionedRegionStatsJUnitTest.java | 6 - .../cache/PartitionedRegionTestHelper.java | 10 - .../cache/PartitionedRegionTestUtilsDUnitTest.java | 9 - .../internal/cache/RegionEntryFlagsJUnitTest.java | 3 - .../cache/RemoteTransactionCCEDUnitTest.java | 3 - .../internal/cache/RemoteTransactionDUnitTest.java | 13 - .../geode/internal/cache/RollbackFunction.java | 1 - .../geode/internal/cache/SizingFlagDUnitTest.java | 8 - .../cache/StartServerWithXmlDUnitTest.java | 15 - .../internal/cache/SystemFailureDUnitTest.java | 10 - .../internal/cache/TXManagerImplJUnitTest.java | 3 - .../org/apache/geode/internal/cache/TestUtils.java | 3 - .../internal/cache/TombstoneCreationJUnitTest.java | 1 - .../cache/TransactionsWithDeltaDUnitTest.java | 7 - ...ommitMessageBackwardCompatibilityDUnitTest.java | 1 - .../org/apache/geode/internal/cache/UnzipUtil.java | 2 - .../internal/cache/UpdateVersionJUnitTest.java | 3 - .../control/MemoryMonitorOffHeapJUnitTest.java | 2 - .../cache/control/RebalanceOperationDUnitTest.java | 16 - ...skRegionOverflowAsyncRollingOpLogJUnitTest.java | 2 - ...iskRegionOverflowSyncRollingOpLogJUnitTest.java | 5 - .../cache/eviction/AbstractEvictionListTest.java | 2 - .../eviction/EvictionObjectSizerDUnitTest.java | 2 - .../cache/eviction/OffHeapEvictionDUnitTest.java | 2 - .../eviction/TransactionsWithOverflowTest.java | 1 - .../cache/execute/CustomerIDPartitionResolver.java | 3 - .../cache/execute/FunctionServiceClientBase.java | 1 - .../FunctionServicePeerAccessorPRDUnitTest.java | 9 - ...vicePeerAccessorPRMultipleMembersDUnitTest.java | 9 - .../execute/LocalDataSetIndexingDUnitTest.java | 4 - .../execute/MemberFunctionExecutionDUnitTest.java | 7 - .../MultiRegionFunctionExecutionDUnitTest.java | 4 - .../execute/MyFunctionExecutionException.java | 4 - .../cache/execute/MyTransactionFunction.java | 4 - ...lientServerFunctionExecutionNoAckDUnitTest.java | 10 - ...ientServerRegionFunctionExecutionDUnitTest.java | 1 - ...egionFunctionExecutionNoSingleHopDUnitTest.java | 2 - ...rRegionFunctionExecutionSingleHopDUnitTest.java | 2 - .../cache/execute/PRColocationDUnitTest.java | 4 - .../cache/execute/PRTransactionDUnitTest.java | 1 - .../PRTransactionWithSizeOperationDUnitTest.java | 2 - .../PRTransactionWithVersionsDUnitTest.java | 3 - .../geode/internal/cache/execute/PerfFunction.java | 2 - .../internal/cache/execute/PerfTxFunction.java | 1 - .../execute/SingleHopGetAllPutAllDUnitTest.java | 2 - .../geode/internal/cache/execute/data/CustId.java | 3 - .../internal/cache/execute/data/Customer.java | 3 - .../geode/internal/cache/execute/data/Order.java | 3 - .../geode/internal/cache/execute/data/OrderId.java | 3 - .../internal/cache/execute/data/Shipment.java | 3 - .../internal/cache/execute/data/ShipmentId.java | 3 - .../mock/AlterMockCacheExtensionFunction.java | 3 - .../mock/AlterMockRegionExtensionFunction.java | 4 - .../mock/CreateMockCacheExtensionFunction.java | 3 - .../mock/CreateMockRegionExtensionFunction.java | 4 - .../mock/DestroyMockCacheExtensionFunction.java | 3 - .../mock/DestroyMockRegionExtensionFunction.java | 3 - .../extension/mock/MockExtensionCommands.java | 1 - .../cache/functions/LocalDataSetFunction.java | 2 - .../ha/BlockingHARQAddOperationJUnitTest.java | 12 - .../cache/ha/BlockingHARQStatsJUnitTest.java | 8 - .../cache/ha/BlockingHARegionJUnitTest.java | 1 - .../geode/internal/cache/ha/Bug48571DUnitTest.java | 1 - .../geode/internal/cache/ha/ConflatableObject.java | 1 - .../cache/ha/EventIdOptimizationJUnitTest.java | 1 - .../internal/cache/ha/HAConflationDUnitTest.java | 4 - .../geode/internal/cache/ha/HAExpiryDUnitTest.java | 2 - .../cache/ha/HARQAddOperationJUnitTest.java | 1 - .../geode/internal/cache/ha/HARegionDUnitTest.java | 10 - .../internal/cache/ha/HARegionQueueDUnitTest.java | 1 - .../cache/ha/HARegionQueueStatsJUnitTest.java | 9 - .../geode/internal/cache/ha/HARegionQueueTest.java | 4 - .../geode/internal/cache/ha/PutAllDUnitTest.java | 1 - .../geode/internal/cache/ha/StatsBugDUnitTest.java | 1 - .../cache/ha/TestBlockingHARegionQueue.java | 4 - .../cache/locks/TXLockServiceDUnitTest.java | 1 - .../internal/cache/map/RegionMapDestroyTest.java | 2 - .../cache/partitioned/Bug39356DUnitTest.java | 3 - .../cache/partitioned/Bug51400DUnitTest.java | 3 - .../cache/partitioned/ElidedPutAllDUnitTest.java | 6 - .../partitioned/PartitionResolverDUnitTest.java | 8 - .../PartitionedRegionLoaderWriterDUnitTest.java | 5 - .../PartitionedRegionMetaDataCleanupDUnitTest.java | 5 - ...sistentColocatedPartitionedRegionDUnitTest.java | 11 - .../PersistentPartitionedRegionDUnitTest.java | 6 - ...sistentPartitionedRegionOldConfigDUnitTest.java | 3 - .../StreamingPartitionOperationManyDUnitTest.java | 2 - .../StreamingPartitionOperationOneDUnitTest.java | 2 - .../fixed/FixedPartitioningDUnitTest.java | 2 - .../fixed/FixedPartitioningTestBase.java | 1 - .../fixed/FixedPartitioningTestBaseJUnitTest.java | 2 - ...oningWithColocationAndPersistenceDUnitTest.java | 2 - .../PartitionedRegionLoadModelJUnitTest.java | 3 - .../PersistentRecoveryOrderDUnitTest.java | 6 - .../PersistentRecoveryOrderOldConfigDUnitTest.java | 8 - .../rollingupgrade/RollingUpgrade2DUnitTest.java | 231 +++--- .../rollingupgrade/RollingUpgradeDUnitTest.java | 330 +++----- .../cache/snapshot/GFSnapshotDUnitTest.java | 1 - .../cache/tier/sockets/AcceptorImplDUnitTest.java | 1 - .../cache/tier/sockets/CacheServerTestUtil.java | 1 + .../CacheServerTransactionsSelectorDUnitTest.java | 3 - .../tier/sockets/ClientConflationDUnitTest.java | 2 - .../sockets/ClientInterestNotifyDUnitTest.java | 2 - .../ClientProxyWithDeltaDistributedTest.java | 1 - .../tier/sockets/ClientServerMiscDUnitTest.java | 2 - .../cache/tier/sockets/ConflationDUnitTest.java | 6 - .../DataSerializerPropagationDUnitTest.java | 28 +- .../sockets/DurableClientQueueSizeDUnitTest.java | 1 - .../internal/cache/tier/sockets/FaultyDelta.java | 2 - .../sockets/ForceInvalidateEvictionDUnitTest.java | 5 - .../tier/sockets/HAInterestPart1DUnitTest.java | 2 - .../tier/sockets/HAInterestPart2DUnitTest.java | 1 - .../sockets/InterestListEndpointPRDUnitTest.java | 3 - .../InterestListEndpointSelectorDUnitTest.java | 3 - .../sockets/InterestResultPolicyDUnitTest.java | 1 - .../cache/tier/sockets/MessageJUnitTest.java | 4 - .../tier/sockets/NewRegionAttributesDUnitTest.java | 1 - .../sockets/RegisterInterestKeysDUnitTest.java | 3 - .../sockets/RegisterInterestKeysPRDUnitTest.java | 3 - .../tier/sockets/ReliableMessagingDUnitTest.java | 1 - .../cache/tier/sockets/ServerConnectionTest.java | 12 - .../tier/sockets/UnregisterInterestDUnitTest.java | 8 - .../sockets/command/ExecuteFunction65Test.java | 1 - .../tier/sockets/command/ExecuteFunctionTest.java | 1 - .../GetClientPartitionAttributesCommandTest.java | 1 - .../cache/tx/RemoteFetchEntryMessageTest.java | 1 - .../cache/tx/RemoteOperationMessageTest.java | 1 - .../internal/cache/tx/RemotePutAllMessageTest.java | 1 - .../internal/cache/tx/RemotePutMessageTest.java | 69 ++ .../cache/tx/RemoteRemoveAllMessageTest.java | 1 - .../versions/RegionVersionHolderJUnitTest.java | 3 - .../RegionVersionVectorIntegrationTest.java | 1 - .../cache/wan/AsyncEventQueueTestBase.java | 18 +- .../asyncqueue/AsyncEventListenerDUnitTest.java | 8 +- .../asyncqueue/AsyncEventQueueStatsDUnitTest.java | 48 +- .../AsyncEventQueueValidationsJUnitTest.java | 3 - .../ConcurrentAsyncEventQueueDUnitTest.java | 3 - .../CommonParallelAsyncEventQueueDUnitTest.java | 3 - .../ParallelGatewaySenderQueueJUnitTest.java | 5 - .../ParallelQueueRemovalMessageJUnitTest.java | 12 + .../CompressionCacheListenerDUnitTest.java | 2 - .../CompressionRegionConfigDUnitTest.java | 4 - .../CompressionRegionFactoryDUnitTest.java | 2 - .../compression/CompressionStatsDUnitTest.java | 2 - .../geode/internal/config/JAXBServiceTest.java | 226 ++++++ .../datasource/ConnectionPoolingJUnitTest.java | 4 - .../org/apache/geode/internal/jta/CacheUtils.java | 3 - .../org/apache/geode/internal/jta/JTAUtils.java | 4 - .../org/apache/geode/internal/jta/SyncImpl.java | 2 - .../internal/jta/TransactionImplJUnitTest.java | 2 - .../internal/jta/UserTransactionImplJUnitTest.java | 2 - .../internal/net/SSLSocketIntegrationTest.java | 1 - .../geode/internal/net/SocketCreatorJUnitTest.java | 1 - .../MemoryAllocatorFillPatternIntegrationTest.java | 2 - .../MemoryAllocatorFillPatternJUnitTest.java | 3 - .../offheap/OffHeapLRURecoveryRegressionTest.java | 1 - .../internal/offheap/TinyMemoryBlockJUnitTest.java | 2 - .../geode/internal/process/lang/AvailablePid.java | 1 - .../geode/internal/size/ObjectTraverserPerf.java | 3 - .../StatTypesAreRolledOverRegressionTest.java | 3 - .../internal/stats50/AtomicStatsJUnitTest.java | 4 - .../geode/internal/util/PluckStacksDUnitTest.java | 5 - .../geode/internal/util/PluckStacksUnitTest.java | 17 - .../org/apache/geode/management/MBeanUtil.java | 14 - .../management/RegionManagementDUnitTest.java | 1 - .../bean/stats/AsyncEventQueueStatsJUnitTest.java | 24 +- .../bean/stats/CacheServerStatsJUnitTest.java | 2 - .../management/bean/stats/DiskStatsJUnitTest.java | 2 - .../bean/stats/GatewayMBeanBridgeJUnitTest.java | 2 - .../bean/stats/GatewayReceiverStatsJUnitTest.java | 3 - .../bean/stats/MemberLevelStatsJUnitTest.java | 2 - .../internal/cli/CommandManagerJUnitTest.java | 4 - .../cli/commands/AlterRegionCommandDUnitTest.java | 1 - .../commands/CommandAvailabilityIndicatorTest.java | 26 +- .../commands/CreateDefinedIndexesCommandTest.java | 8 +- .../cli/commands/CreateIndexCommandTest.java | 14 +- .../cli/commands/CreateRegionCommandTest.java | 22 +- .../DescribeJndiBindingCommandDUnitTest.java | 2 +- .../cli/commands/DescribeRegionDUnitTest.java | 66 +- .../commands/DescribeRegionIntegrationTest.java | 1 - .../cli/commands/DescribeRegionJUnitTest.java | 56 +- .../commands/DestroyJndiBindingCommandTest.java | 5 + .../cli/commands/ListGatewayCommandTest.java | 106 +++ .../commands/ListJndiBindingCommandDUnitTest.java | 16 +- .../cli/commands/ListRegionIntegrationTest.java | 1 - .../cli/commands/ShowMetricsJUnitTest.java | 6 +- .../GfshStatusCommandsIntegrationTest.java | 8 +- .../cli/functions/RegionFunctionArgsTest.java | 1 - .../ShowMissingDiskStoresFunctionJUnitTest.java | 1 - .../functions/SizeExportLogsFunctionFileTest.java | 2 - .../internal/cli/json/GfJsonArrayTest.java | 155 ++++ .../internal/cli/json/GfJsonObjectTest.java | 148 ++++ .../internal/cli/result/ResultBuilderTest.java | 93 ++- .../internal/cli/result/TabularResultDataTest.java | 47 +- .../internal/cli/util/HyphenFormatterTest.java | 2 - .../internal/cli/util/LogFilterTest.java | 1 - .../ClusterConfigImportDUnitTest.java | 6 +- .../ClusterConfigLocatorRestartDUnitTest.java | 35 +- .../configuration/EventTestCacheWriter.java | 2 - .../domain/CacheElementJUnitTest.java | 1 - .../GetClusterConfigurationFunctionTest.java | 128 ++++ .../utils/XmlUtilsAddNewNodeJUnitTest.java | 11 - .../configuration/utils/XmlUtilsJUnitTest.java | 3 - .../internal/pulse/TestFunctionsDUnitTest.java | 2 - .../internal/pulse/TestHeapDUnitTest.java | 2 - .../internal/pulse/TestLocatorsDUnitTest.java | 2 - .../security/GfshCommandsSecurityTest.java | 10 +- .../internal/security/MultiGfshDUnitTest.java | 2 +- .../internal/security/TestFunctions.java | 1 - .../org/apache/geode/management/model/Item.java | 11 - .../org/apache/geode/management/model/Order.java | 13 - .../memcached/GemcachedBinaryClientJUnitTest.java | 6 - .../geode/pdx/AutoSerializableJUnitTest.java | 2 - .../org/apache/geode/pdx/ByteSourceJUnitTest.java | 1 - .../java/org/apache/geode/pdx/DSInsidePdx.java | 1 - .../geode/pdx/JSONPdxClientServerDUnitTest.java | 2 - .../test/java/org/apache/geode/pdx/NestedPdx.java | 1 - .../geode/pdx/PDXAsyncEventQueueDUnitTest.java | 3 - .../apache/geode/pdx/PdxAttributesJUnitTest.java | 5 - .../apache/geode/pdx/PdxClientServerDUnitTest.java | 1 - .../geode/pdx/PdxDeserializationDUnitTest.java | 7 - .../java/org/apache/geode/pdx/PdxInsideDS.java | 1 - .../org/apache/geode/pdx/PdxInstanceJUnitTest.java | 3 - .../org/apache/geode/pdx/PdxStringJUnitTest.java | 1 - .../apache/geode/pdx/PdxTypeExportDUnitTest.java | 2 - .../apache/geode/pdx/SeparateClassloaderPdx.java | 1 - .../java/org/apache/geode/pdx/SimpleClass1.java | 1 - .../java/org/apache/geode/pdx/SimpleClass2.java | 3 - .../geode/pdx/internal/MultipleCacheJUnitTest.java | 4 - .../java/org/apache/geode/redis/AuthJUnitTest.java | 1 - .../apache/geode/redis/ConcurrentStartTest.java | 1 - .../org/apache/geode/redis/HashesJUnitTest.java | 1 - .../org/apache/geode/redis/ListsJUnitTest.java | 1 - .../apache/geode/redis/SortedSetsJUnitTest.java | 1 - .../org/apache/geode/redis/StringsJunitTest.java | 1 - .../apache/geode/security/SecurityTestUtil.java | 1 - .../geode/security/SimpleSecurityManagerTest.java | 1 - ...tionedQuerySecurityAllowedQueriesDUnitTest.java | 1 - ...nedQuerySecurityRestrictedQueriesDUnitTest.java | 1 - .../QuerySecurityRestrictedQueriesDUnitTest.java | 9 - ...rityRetrictedButMethodsDoNotExistDUnitTest.java | 1 - .../geode/security/query/UserPermissions.java | 8 - .../apache/geode/sequence/DefaultLineMapper.java | 1 - .../geode/sequence/GemfireSequenceDisplay.java | 8 - .../org/apache/geode/sequence/HydraLineMapper.java | 4 - .../java/org/apache/geode/sequence/Lifeline.java | 2 - .../org/apache/geode/sequence/SequenceDiagram.java | 7 - .../apache/geode/test/dunit/DUnitBlackboard.java | 2 - .../geode/test/dunit/DistributedTestUtils.java | 1 - .../java/org/apache/geode/test/dunit/Jitter.java | 1 - .../dunit/internal/InternalBlackboardImpl.java | 1 - .../dunit/internal/JUnit4DistributedTestCase.java | 25 +- .../test/dunit/rules/CleanupDUnitVMsRule.java | 1 - .../geode/test/dunit/rules/ClusterStartupRule.java | 1 + .../geode/test/dunit/standalone/ChildVM.java | 3 - .../test/dunit/standalone/ProcessManager.java | 3 - .../apache/geode/test/golden/GoldenTestCase.java | 2 - .../geode/test/junit/rules/GfshCommandRule.java | 13 +- .../apache/geode/test/junit/rules/VMProvider.java | 9 + .../java/parReg/query/unittest/NewPortfolio.java | 3 - geode-core/src/test/java/util/TestException.java | 1 - .../codeAnalysis/sanctionedDataSerializables.txt | 4 +- geode-cq/build.gradle | 2 +- .../geode/cache/client/internal/CloseCQOp.java | 3 - .../geode/cache/client/internal/CreateCQOp.java | 4 - .../cache/client/internal/CreateCQWithIROp.java | 4 - .../cache/client/internal/GetDurableCQsOp.java | 3 - .../geode/cache/client/internal/StopCQOp.java | 3 - .../cache/query/internal/cq/ClientCQImpl.java | 1 - .../cache/query/internal/cq/ServerCQImpl.java | 1 - .../geode/internal/CQDistributedSystemService.java | 1 - .../cache/tier/sockets/command/CloseCQ.java | 1 - .../cache/tier/sockets/command/ExecuteCQ61.java | 1 - .../cache/query/cq/dunit/CqDataDUnitTest.java | 14 - .../cq/dunit/CqDataOptimizedExecuteDUnitTest.java | 3 - .../CqDataUsingPoolOptimizedExecuteDUnitTest.java | 3 - .../cache/query/cq/dunit/CqPerfDUnitTest.java | 9 - .../query/cq/dunit/CqPerfUsingPoolDUnitTest.java | 9 - .../cache/query/cq/dunit/CqQueryDUnitTest.java | 20 - .../cq/dunit/CqQueryOptimizedExecuteDUnitTest.java | 2 - .../CqQueryUsingPoolOptimizedExecuteDUnitTest.java | 3 - .../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 13 - ...esultSetUsingPoolOptimizedExecuteDUnitTest.java | 4 - ...curityPartitionedUnauthorizedUserDUnitTest.java | 8 - .../cache/query/cq/dunit/CqStatsDUnitTest.java | 2 - .../cq/dunit/CqStatsOptimizedExecuteDUnitTest.java | 4 - .../query/cq/dunit/CqStatsUsingPoolDUnitTest.java | 2 - .../cache/query/cq/dunit/CqTimeTestListener.java | 3 - ...onedRegionCqQueryOptimizedExecuteDUnitTest.java | 2 - .../query/cq/dunit/PrCqUsingPoolDUnitTest.java | 1 - .../PrCqUsingPoolOptimizedExecuteDUnitTest.java | 3 - .../cache/query/dunit/PdxQueryCQDUnitTest.java | 2 - .../query/dunit/QueryIndexUpdateRIDUnitTest.java | 10 - .../cache/query/dunit/QueryMonitorDUnitTest.java | 1 - .../internal/cache/ha/CQListGIIDUnitTest.java | 1 - .../tier/sockets/DurableClientSimpleDUnitTest.java | 1 - .../cache/tier/sockets/DurableClientTestCase.java | 5 - .../tier/sockets/command/ExecuteCQ61Test.java | 1 - .../management/CacheServerManagementDUnitTest.java | 10 - .../management/internal/pulse/TestCQDUnitTest.java | 2 - .../internal/pulse/TestClientsDUnitTest.java | 2 - .../internal/pulse/TestServerDUnitTest.java | 2 - .../security/ClientAuthorizationCQDUnitTest.java | 2 +- .../geode/test/dunit/rules/CQUnitTestRule.java | 2 - .../query_additional/advanced_querying.html.md.erb | 12 +- .../query_additional/query_timeout.html.md.erb | 36 + .../monitor_queries_for_low_memory.html.md.erb | 27 +- .../installation/install_standalone.html.md.erb | 8 +- .../system_requirements/host_machine.html.md.erb | 2 +- .../management/list_of_mbeans_full.html.md.erb | 35 +- geode-docs/reference/statistics_list.html.md.erb | 3 +- .../gfsh/command-pages/create.html.md.erb | 2 +- .../gfsh/command-pages/destroy.html.md.erb | 30 + .../gfsh/command-pages/list.html.md.erb | 39 + .../apache/geode/experimental/driver/Driver.java | 1 - .../geode/experimental/driver/DriverFactory.java | 1 - .../geode/experimental/driver/ProtobufDriver.java | 1 - .../geode/experimental/driver/ProtobufRegion.java | 1 - .../apache/geode/experimental/driver/Region.java | 9 - .../geode/experimental/driver/ValueSerializer.java | 1 - .../driver/AllTypesJavaSerializer.java | 8 - .../driver/FunctionServiceIntegrationTest.java | 1 - .../experimental/driver/IntegrationTestBase.java | 7 - .../driver/QueryServiceIntegrationTest.java | 1 - .../experimental/driver/RegionIntegrationTest.java | 2 - .../driver/ValueSerializerIntegrationTest.java | 3 - .../apache/geode/test/compiler/ClassBuilder.java | 1 - .../apache/geode/test/junit/rules/RuleList.java | 1 - .../geode/test/junit/rules/gfsh/GfshExecution.java | 2 - .../apache/geode/test/compiler/JarBuilderTest.java | 1 - .../geode/test/compiler/JavaCompilerTest.java | 1 - geode-lucene/build.gradle | 2 +- .../geode/cache/lucene/LuceneQueryFactory.java | 4 - .../geode/cache/lucene/LuceneSerializer.java | 2 - .../apache/geode/cache/lucene/LuceneService.java | 1 - .../lucene/internal/IndexRepositoryFactory.java | 1 - .../cache/lucene/internal/InternalLuceneIndex.java | 1 + .../LuceneIndexCreationInProgressException.java | 16 +- .../internal/LuceneIndexCreationProfile.java | 1 - .../internal/LuceneIndexForPartitionedRegion.java | 13 +- .../cache/lucene/internal/LuceneQueryImpl.java | 2 + .../cache/lucene/internal/LuceneRawIndex.java | 9 +- .../lucene/internal/LuceneRegionListener.java | 3 +- .../cache/lucene/internal/LuceneServiceImpl.java | 22 +- .../internal/PartitionedRepositoryManager.java | 26 +- .../internal/RawLuceneRepositoryManager.java | 17 +- .../lucene/internal/distributed/TopEntries.java | 1 - .../internal/filesystem/SeekableInputStream.java | 1 - .../internal/repository/IndexRepository.java | 6 - .../internal/repository/IndexRepositoryImpl.java | 1 - .../serializer/HeterogeneousLuceneSerializer.java | 2 - .../internal/xml/LuceneIndexXmlGenerator.java | 5 - .../sanctioned-geode-lucene-serializables.txt | 1 + .../lucene/FlatFormatSerializerJUnitTest.java | 1 - .../apache/geode/cache/lucene/LocalCacheRule.java | 1 - .../lucene/LuceneClientSecurityDUnitTest.java | 19 +- ...urityWithRegionCreatedBeforeIndexDUnitTest.java | 64 ++ .../lucene/LuceneCommandsSecurityDUnitTest.java | 8 +- ...urityWithRegionCreatedBeforeIndexDUnitTest.java | 64 ++ .../apache/geode/cache/lucene/LuceneDUnitTest.java | 1 - .../cache/lucene/LuceneIndexCreationDUnitTest.java | 14 +- .../geode/cache/lucene/LuceneIntegrationTest.java | 1 - .../lucene/LuceneQueriesReindexDUnitTest.java | 2 + .../NestedObjectSeralizerIntegrationTest.java | 2 - ...ncyWithRegionCreatedBeforeReindexDUnitTest.java | 1 + .../internal/LuceneEventListenerJUnitTest.java | 1 - .../LuceneIndexForPartitionedRegionTest.java | 38 +- .../LuceneIndexRecoveryHAIntegrationTest.java | 8 +- .../lucene/internal/LuceneQueryImplJUnitTest.java | 2 +- .../internal/LuceneServiceImplJUnitTest.java | 5 + .../PartitionedRepositoryManagerJUnitTest.java | 75 +- .../RawLuceneRepositoryManagerJUnitTest.java | 10 +- .../internal/cli/LuceneIndexCommandsJUnitTest.java | 1 - ...neIndexCommandsWithReindexAllowedDUnitTest.java | 1 - .../LuceneListIndexFunctionJUnitTest.java | 1 - .../repository/IndexRepositoryImplJUnitTest.java | 3 - .../IndexRepositoryImplPerformanceTest.java | 1 - .../xml/LuceneIndexXmlGeneratorJUnitTest.java | 3 - .../LuceneIndexXmlParserIntegrationJUnitTest.java | 1 - .../apache/geode/cache/lucene/test/Customer.java | 1 - .../cache/lucene/test/LuceneTestSerializer.java | 3 - .../org/apache/geode/cache/lucene/test/Person.java | 2 - .../execute/EmtpyRegionFunctionException.java | 1 - .../gemfire/cache/execute/FunctionException.java | 5 - geode-old-versions/build.gradle | 1 + .../test/dunit/standalone/VersionManager.java | 1 + .../internal/protocol/protobuf/v1/Failure.java | 2 - .../protobuf/v1/ProtobufProtocolService.java | 2 - .../protobuf/v1/ServerMessageExecutionContext.java | 1 - .../v1/authentication/AuthorizingCache.java | 2 - .../operations/ClearRequestOperationHandler.java | 6 - ...cuteFunctionOnGroupRequestOperationHandler.java | 8 - .../GetRegionNamesRequestOperationHandler.java | 2 - .../v1/operations/GetRequestOperationHandler.java | 4 - .../operations/GetSizeRequestOperationHandler.java | 3 - .../v1/operations/KeySetOperationHandler.java | 8 - .../PutIfAbsentRequestOperationHandler.java | 5 - .../v1/operations/PutRequestOperationHandler.java | 3 - .../operations/RemoveRequestOperationHandler.java | 2 - .../registry/ProtobufOperationContextRegistry.java | 1 - .../protobuf/v1/state/ConnectionState.java | 1 - .../protobuf/v1/state/RequireAuthentication.java | 5 - .../CompressingProtobufStructSerializer.java | 1 - .../protocol/serialization/ValueSerializer.java | 2 - .../OutputCapturingServerConnectionTest.java | 5 +- .../tier/sockets/ProtobufServerConnectionTest.java | 3 +- .../internal/protocol/TestExecutionContext.java | 2 - .../protobuf/ProtobufStreamProcessorTest.java | 1 - .../internal/protocol/protobuf/v1/MessageUtil.java | 1 - .../v1/ProtocolVersionIntegrationTest.java | 1 - .../protobuf/v1/TestSerializeAllSerializer.java | 7 - .../v1/acceptance/CacheOperationsJUnitTest.java | 1 - .../LocatorConnectionAuthenticationDUnitTest.java | 1 - .../ClearRequestOperationHandlerJUnitTest.java | 9 - ...ionOnGroupRequestOperationHandlerJUnitTest.java | 5 - ...onOnMemberRequestOperationHandlerJUnitTest.java | 5 - ...onOnRegionRequestOperationHandlerJUnitTest.java | 7 - .../GetAllRequestOperationHandlerJUnitTest.java | 3 - .../GetRequestOperationHandlerJUnitTest.java | 4 - .../GetServerOperationHandlerJUnitTest.java | 1 - .../GetSizeRequestOperationHandlerJUnitTest.java | 3 - .../KeySetOperationHandlerJUnitTest.java | 8 - .../v1/operations/OperationHandlerJUnitTest.java | 1 - .../OqlQueryRequestOperationHandlerJUnitTest.java | 1 - ...utIfAbsentRequestOperationHandlerJUnitTest.java | 1 - .../RemoveRequestOperationHandlerJUnitTest.java | 2 - .../CompressingProtobufStructSerializerTest.java | 8 - .../serialization/PdxInstanceGenerator.java | 1 - .../ProtobufStructSerializerTest.java | 6 - .../internal/controllers/PulseController.java | 3 - .../geode/tools/pulse/internal/data/Cluster.java | 17 - .../tools/pulse/internal/data/DataBrowser.java | 1 - .../service/ClusterMembersRGraphService.java | 5 - .../internal/service/ClusterRegionService.java | 1 - .../internal/service/ClusterRegionsService.java | 1 - .../service/ClusterSelectedRegionService.java | 1 - .../internal/service/SystemAlertsService.java | 1 - .../tools/pulse/internal/util/ConnectionUtil.java | 4 - .../geode/tools/pulse/internal/util/TimeUtils.java | 2 - geode-pulse/src/main/webapp/META-INF/NOTICE | 2 +- .../tools/pulse/tests/junit/BaseServiceTest.java | 1 - .../geode/tools/pulse/tests/ui/PulseBase.java | 3 - geode-wan/build.gradle | 2 +- .../geode/cache/client/internal/SenderProxy.java | 2 - .../client/internal/locator/wan/LocatorHelper.java | 14 - .../locator/wan/LocatorMembershipListenerImpl.java | 2 - .../locator/wan/RemoteLocatorJoinRequest.java | 1 - .../locator/wan/RemoteLocatorJoinResponse.java | 1 - .../locator/wan/RemoteLocatorPingRequest.java | 5 - .../locator/wan/RemoteLocatorPingResponse.java | 3 - .../internal/locator/wan/RemoteLocatorRequest.java | 4 - .../locator/wan/RemoteLocatorResponse.java | 4 - .../locator/wan/WanLocatorDiscovererImpl.java | 4 - .../internal/WANDistributedSystemService.java | 1 - .../cache/wan/GatewayReceiverFactoryImpl.java | 14 +- .../wan/GatewaySenderEventRemoteDispatcher.java | 2 - .../cache/wan/GatewaySenderFactoryImpl.java | 1 - ...currentParallelGatewaySenderEventProcessor.java | 1 - .../RemoteParallelGatewaySenderEventProcessor.java | 2 - .../cache/wan/serial/SerialGatewaySenderImpl.java | 1 - .../cache/wan/AckReaderThreadJUnitTest.java | 2 - ...ueueOverflowMBeanAttributesDistributedTest.java | 1 - .../wan/GatewayReceiverFactoryImplJUnitTest.java | 1 - .../cache/wan/GatewayReceiverImplJUnitTest.java | 1 - ...atewaySenderEventRemoteDispatcherJUnitTest.java | 1 - .../geode/internal/cache/wan/WANTestBase.java | 159 +++- .../ConcurrentParallelGatewaySenderDUnitTest.java | 7 - ...rrentParallelGatewaySenderOffHeapDUnitTest.java | 3 - ...ParallelGatewaySenderOperation_1_DUnitTest.java | 6 - ...ParallelGatewaySenderOperation_2_DUnitTest.java | 5 - ...rentSerialGatewaySenderOperationsDUnitTest.java | 6 - ...ialGatewaySenderOperationsOffHeapDUnitTest.java | 3 - .../ConcurrentWANPropagation_1_DUnitTest.java | 10 - .../ConcurrentWANPropagation_2_DUnitTest.java | 3 - .../misc/CommonParallelGatewaySenderDUnitTest.java | 5 - ...ommonParallelGatewaySenderOffHeapDUnitTest.java | 3 - .../NewWANConcurrencyCheckForDestroyDUnitTest.java | 2 - .../cache/wan/misc/PDXNewWanDUnitTest.java | 5 - ...atedRegion_ParallelWANPropagationDUnitTest.java | 3 - .../cache/wan/misc/WANConfigurationJUnitTest.java | 2 - .../cache/wan/misc/WanAutoDiscoveryDUnitTest.java | 4 - .../cache/wan/misc/WanValidationsDUnitTest.java | 16 +- ...lGatewaySenderOperation_2_OffHeapDUnitTest.java | 3 - ...lGatewaySenderOperation_2_OffHeapDUnitTest.java | 3 - ...GatewaySenderQueueOverflowOffHeapDUnitTest.java | 3 - .../ParallelWANConflationOffHeapDUnitTest.java | 3 - ...stenceEnabledGatewaySenderOffHeapDUnitTest.java | 3 - ...ANPropagationConcurrentOpsOffHeapDUnitTest.java | 3 - .../ParallelWANPropagationOffHeapDUnitTest.java | 3 - .../SerialGatewaySenderQueueOffHeapDUnitTest.java | 3 - ...stenceEnabledGatewaySenderOffHeapDUnitTest.java | 3 - ...ParallelGatewaySenderOperation_2_DUnitTest.java | 3 - .../ParallelGatewaySenderOperationsDUnitTest.java | 38 +- .../parallel/ParallelWANConflationDUnitTest.java | 62 +- ...ANPersistenceEnabledGatewaySenderDUnitTest.java | 3 - ...arallelWANPropagationClientServerDUnitTest.java | 1 - ...rallelWANPropagationConcurrentOpsDUnitTest.java | 5 - .../parallel/ParallelWANPropagationDUnitTest.java | 8 - .../ParallelWANPropagationLoopBackDUnitTest.java | 2 - .../wan/parallel/ParallelWANStatsDUnitTest.java | 151 +++- .../cache/wan/serial/GatewayReceiverDUnitTest.java | 4 - ...lGatewaySenderDistributedDeadlockDUnitTest.java | 2 - .../SerialGatewaySenderEventListenerDUnitTest.java | 1 - .../SerialGatewaySenderOperationsDUnitTest.java | 56 +- .../serial/SerialGatewaySenderQueueDUnitTest.java | 14 +- .../wan/serial/SerialWANConflationDUnitTest.java | 76 +- ...ANPersistenceEnabledGatewaySenderDUnitTest.java | 5 - .../wan/serial/SerialWANPropagationDUnitTest.java | 1 + .../SerialWANPropagationLoopBackDUnitTest.java | 3 - ...lWANPropagation_PartitionedRegionDUnitTest.java | 3 - .../SerialWANPropagationsFeatureDUnitTest.java | 2 - .../cache/wan/serial/SerialWANStatsDUnitTest.java | 2 - .../CreateGatewayReceiverCommandDUnitTest.java | 152 ++-- .../WANClusterConfigurationDUnitTest.java | 391 ++++++++++ .../web/controllers/support/RegionEntryData.java | 19 - geode-web-api/src/main/webapp/META-INF/NOTICE | 2 +- .../commands/ShutdownCommandOverHttpDUnitTest.java | 1 - gradle.properties | 2 +- gradle/dependency-versions.properties | 4 +- gradle/spotless.gradle | 20 +- gradle/test.gradle | 20 +- gradle/wrapper/gradle-wrapper.jar | Bin 53639 -> 54711 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 68 +- gradlew.bat | 12 +- 1843 files changed, 9336 insertions(+), 13798 deletions(-) diff --cc geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnection.java index d6dc58c,8392eaf..bd65271 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnection.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnection.java @@@ -19,8 -18,7 +19,6 @@@ import java.io.BufferedInputStream import java.io.BufferedOutputStream; import java.io.EOFException; import java.io.IOException; --import java.io.InputStream; - import java.io.OutputStream; import java.net.InetSocketAddress; import java.net.Socket; @@@ -74,8 -70,11 +71,13 @@@ public class ProtobufServerConnection e InternalCache cache = getCache(); cache.setReadSerializedForCurrentThread(true); try { + protocolProcessor.processMessage(input, output); + output.flush(); + try { - protocolProcessor.processMessage(inputStream, output); ++ protocolProcessor.processMessage(input, output); + } finally { + output.flush(); + } } finally { cache.setReadSerializedForCurrentThread(false); } diff --cc geode-protobuf/src/main/java/org/apache/geode/protocol/serialization/CompressingProtobufStructSerializer.java index c807062,0000000..868df48 mode 100644,000000..100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/serialization/CompressingProtobufStructSerializer.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/serialization/CompressingProtobufStructSerializer.java @@@ -1,50 -1,0 +1,49 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.geode.protocol.serialization; + +import java.io.IOException; + +import com.google.protobuf.ByteString; +import com.google.protobuf.UnsafeByteOperations; +import org.iq80.snappy.Snappy; + +import org.apache.geode.cache.Cache; - import org.apache.geode.compression.SnappyCompressor; +import org.apache.geode.internal.protocol.protobuf.v1.Struct; + +public class CompressingProtobufStructSerializer implements ValueSerializer { + private final ProtobufStructSerializer delegate = new ProtobufStructSerializer(); + + @Override + public ByteString serialize(Object object) throws IOException { + Struct uncompressed = delegate.serializeStruct(object); + byte[] compressed = Snappy.compress(uncompressed.toByteArray()); + return UnsafeByteOperations.unsafeWrap(compressed); + } + + @Override + public Object deserialize(ByteString bytes) throws IOException, ClassNotFoundException { + byte[] compressed = bytes.toByteArray(); + byte[] uncompressed = Snappy.uncompress(compressed, 0, compressed.length); + ByteString byteString = UnsafeByteOperations.unsafeWrap(uncompressed); + return delegate.deserialize(byteString); + } + + @Override + public void init(Cache cache) { + delegate.init(cache); + + } +} diff --cc geode-protobuf/src/test/java/org/apache/geode/protocol/serialization/CompressingProtobufStructSerializerTest.java index 2a65b12,0000000..42b7852 mode 100644,000000..100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/serialization/CompressingProtobufStructSerializerTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/serialization/CompressingProtobufStructSerializerTest.java @@@ -1,84 -1,0 +1,76 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.geode.protocol.serialization; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.util.ArrayList; - import java.util.Arrays; - import java.util.List; + +import com.google.protobuf.ByteString; +import com.pholser.junit.quickcheck.From; +import com.pholser.junit.quickcheck.Property; - import com.pholser.junit.quickcheck.When; +import com.pholser.junit.quickcheck.runner.JUnitQuickcheck; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; - import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; + +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.distributed.ConfigurationProperties; - import org.apache.geode.internal.protocol.protobuf.v1.BasicTypes; - import org.apache.geode.internal.protocol.protobuf.v1.ListValue; - import org.apache.geode.internal.protocol.protobuf.v1.Struct; - import org.apache.geode.internal.protocol.protobuf.v1.Value; +import org.apache.geode.pdx.PdxInstance; +import org.apache.geode.test.junit.categories.IntegrationTest; + +@RunWith(JUnitQuickcheck.class) +@Category(IntegrationTest.class) +public class CompressingProtobufStructSerializerTest { + + private CompressingProtobufStructSerializer serializer; + private static Cache cache; + + @BeforeClass + public static void createCache() { + cache = new CacheFactory().set(ConfigurationProperties.LOG_LEVEL, "error") + .setPdxReadSerialized(true).create(); + } + + @Before + public void createSerializer() { + serializer = new CompressingProtobufStructSerializer(); + serializer.init(cache); + } + + @AfterClass + public static void tearDown() { + cache.close(); + } + + + @Property(trials = 10) + public void testSymmetry( + @PdxInstanceGenerator.ClassName(ProtobufStructSerializer.PROTOBUF_STRUCT) @PdxInstanceGenerator.FieldTypes({ + String.class, int.class, long.class, byte.class, byte[].class, double.class, + PdxInstance.class, + ArrayList.class}) @From(PdxInstanceGenerator.class) PdxInstance original) + throws IOException, ClassNotFoundException { + ByteString bytes = serializer.serialize(original); + PdxInstance actual = (PdxInstance) serializer.deserialize(bytes); + assertThat(original).isEqualTo(actual); + assertEquals(actual, original); + } +} diff --cc geode-protobuf/src/test/java/org/apache/geode/protocol/serialization/PdxInstanceGenerator.java index 5f13f6f,0000000..d1ab528 mode 100644,000000..100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/serialization/PdxInstanceGenerator.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/serialization/PdxInstanceGenerator.java @@@ -1,153 -1,0 +1,152 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.geode.protocol.serialization; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE_USE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; - import java.util.List; +import java.util.Map; +import java.util.Set; + +import com.pholser.junit.quickcheck.generator.GenerationStatus; +import com.pholser.junit.quickcheck.generator.Generator; +import com.pholser.junit.quickcheck.generator.GeneratorConfiguration; +import com.pholser.junit.quickcheck.random.SourceOfRandomness; + +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.pdx.PdxInstance; +import org.apache.geode.pdx.PdxInstanceFactory; + +public class PdxInstanceGenerator extends Generator { + + + private static final Map<Class<?>, Method> supportedTypes; + public static final GenerationStatus.Key DEPTH = new GenerationStatus.Key("depth", Integer.class); + + static { + HashMap<Class<?>, Method> types = new HashMap<>(); + Method[] methods = PdxInstanceFactory.class.getDeclaredMethods(); + for (Method method : methods) { + if (method.getName().startsWith("write") && method.getParameterTypes().length == 2) { + Class<?> type = method.getParameterTypes()[1]; + + if (type == Object.class) { + types.put(PdxInstance.class, method); + types.put(ArrayList.class, method); + } else { + types.put(type, method); + } + } + } + + supportedTypes = Collections.unmodifiableMap(types); + + } + private Set<Class<?>> allowedFieldTypes; + private String className = "NO_CLASS"; + + + public PdxInstanceGenerator() { + super(PdxInstance.class); + } + + @Override + public Object generate(SourceOfRandomness random, GenerationStatus status) { + + Map<Class<?>, Method> writeMethods = getAllowedWriteMethods(); + + int numFields = random.nextInt(0, 20); + PdxInstanceFactory factory = CacheFactory.getAnyInstance().createPdxInstanceFactory(className); + Set<String> fieldNames = + new HashSet<>(gen().type(String.class).times(numFields).generate(random, status)); + for (String fieldName : fieldNames) { + Map.Entry<Class<?>, Method> writeMethod = random.choose(writeMethods.entrySet()); + Class<?> type = writeMethod.getKey(); + Method method = writeMethod.getValue(); + Object value = null; + if (type == PdxInstance.class) { + int depth = (int) status.valueOf(DEPTH).orElse(0); + if (depth < status.size()) { + status.setValue(DEPTH, depth + 1); + value = generate(random, status); + } + } else if (type == ArrayList.class) { + int depth = (int) status.valueOf(DEPTH).orElse(0); + if (depth < status.size()) { + status.setValue(DEPTH, depth + 1); + ArrayList<PdxInstance> list = new ArrayList<>(); + list.add((PdxInstance) generate(random, status)); + value = list; + } + } else { + value = gen().type(type).generate(random, status); + } + try { + method.invoke(factory, fieldName, value); + } catch (IllegalAccessException | InvocationTargetException e) { + throw new IllegalStateException(e); + } + } + + return factory.create(); + } + + private Map<Class<?>, Method> getAllowedWriteMethods() { + final Map<Class<?>, Method> writeMethods = new HashMap<>(supportedTypes); + writeMethods.keySet().retainAll(allowedFieldTypes); + + if (writeMethods.size() != allowedFieldTypes.size()) { + HashSet<Class<?>> classes = new HashSet<>(allowedFieldTypes); + classes.removeAll(supportedTypes.keySet()); + throw new IllegalStateException("Cannot generate value of types " + classes); + } + + return writeMethods; + } + + public void configure(FieldTypes fieldTypes) { + this.allowedFieldTypes = new HashSet<>(Arrays.asList(fieldTypes.value())); + } + + public void configure(ClassName className) { + this.className = className.value(); + } + + @Target({PARAMETER, FIELD, ANNOTATION_TYPE, TYPE_USE}) + @Retention(RUNTIME) + @GeneratorConfiguration + public @interface FieldTypes { + Class<?>[] value(); + } + + @Target({PARAMETER, FIELD, ANNOTATION_TYPE, TYPE_USE}) + @Retention(RUNTIME) + @GeneratorConfiguration + public @interface ClassName { + String value(); + } +} diff --cc geode-protobuf/src/test/java/org/apache/geode/protocol/serialization/ProtobufStructSerializerTest.java index 13192fc,0000000..d8accbe mode 100644,000000..100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/serialization/ProtobufStructSerializerTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/serialization/ProtobufStructSerializerTest.java @@@ -1,174 -1,0 +1,168 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.geode.protocol.serialization; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.*; - import static org.mockito.ArgumentMatchers.any; - import static org.mockito.Mockito.mock; - import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import com.google.protobuf.ByteString; +import com.pholser.junit.quickcheck.From; +import com.pholser.junit.quickcheck.Property; - import com.pholser.junit.quickcheck.When; +import com.pholser.junit.quickcheck.runner.JUnitQuickcheck; - import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; + +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.distributed.ConfigurationProperties; +import org.apache.geode.internal.protocol.protobuf.v1.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.v1.ListValue; +import org.apache.geode.internal.protocol.protobuf.v1.Struct; +import org.apache.geode.internal.protocol.protobuf.v1.Value; +import org.apache.geode.pdx.PdxInstance; +import org.apache.geode.test.junit.categories.IntegrationTest; - import org.apache.geode.test.junit.categories.UnitTest; + +@RunWith(JUnitQuickcheck.class) +@Category(IntegrationTest.class) +public class ProtobufStructSerializerTest { + + private ProtobufStructSerializer serializer; + private static Cache cache; + + @BeforeClass + public static void createCache() { + cache = new CacheFactory().set(ConfigurationProperties.LOG_LEVEL, "error") + .setPdxReadSerialized(true).create(); + } + + @Before + public void createSerializer() { + serializer = new ProtobufStructSerializer(); + serializer.init(cache); + } + + @AfterClass + public static void tearDown() { + cache.close(); + } + + @Test + public void testDeserialize() throws IOException, ClassNotFoundException { + Struct struct = structWithStringField(); + ByteString bytes = struct.toByteString(); + PdxInstance value = (PdxInstance) serializer.deserialize(bytes); + + assertEquals("value", value.getField("field1")); + } + + private Struct structWithStringField() { + return Struct.newBuilder() + .putFields("field1", Value.newBuilder() + .setEncodedValue(BasicTypes.EncodedValue.newBuilder().setStringResult("value")).build()) + .build(); + } + + @Test + public void testSerialize() throws IOException, ClassNotFoundException { + PdxInstance value = pdxWithStringField(); + ByteString bytes = serializer.serialize(value); + Struct struct = Struct.parseFrom(bytes); + + assertEquals("value", struct.getFieldsMap().get("field1").getEncodedValue().getStringResult()); + } + + private PdxInstance pdxWithStringField() { + return cache.createPdxInstanceFactory(ProtobufStructSerializer.PROTOBUF_STRUCT) + .writeString("field1", "value").create(); + } + + @Test + public void canSerializeWithNestedPdxInstance() throws IOException, ClassNotFoundException { + PdxInstance value = cache.createPdxInstanceFactory(ProtobufStructSerializer.PROTOBUF_STRUCT) + .writeObject("field1", pdxWithStringField()).create(); + ByteString bytes = serializer.serialize(value); + Struct struct = Struct.parseFrom(bytes); + + assertEquals("value", struct.getFieldsMap().get("field1").getStructValue().getFieldsMap() + .get("field1").getEncodedValue().getStringResult()); + } + + @Test + public void canSerializeWithNestedList() throws IOException, ClassNotFoundException { + ArrayList<PdxInstance> list = new ArrayList<>(); + list.add(pdxWithStringField()); + PdxInstance value = cache.createPdxInstanceFactory(ProtobufStructSerializer.PROTOBUF_STRUCT) + .writeObject("field2", list).create(); + ByteString bytes = serializer.serialize(value); + Struct struct = Struct.parseFrom(bytes); + + assertEquals(Struct.newBuilder() + .putFields("field2", + Value.newBuilder() + .setListValue(ListValue.newBuilder() + .addValues(Value.newBuilder().setStructValue(structWithStringField()))) + .build()) + .build(), struct); + } + + @Test + public void canDeserializeWithNestedStruct() throws IOException, ClassNotFoundException { + Struct.Builder builder = Struct.newBuilder(); + builder.putFields("field1", Value.newBuilder().setStructValue(structWithStringField()).build()); + ByteString bytes = builder.build().toByteString(); + PdxInstance value = (PdxInstance) serializer.deserialize(bytes); + + PdxInstance nested = (PdxInstance) value.getField("field1"); + assertEquals("value", nested.getField("field1")); + } + + @Test + public void canDeserializeWithNestedList() throws IOException, ClassNotFoundException { + Struct.Builder builder = Struct.newBuilder(); + builder.putFields("field1", + Value.newBuilder() + .setListValue(ListValue.newBuilder().addValues(Value.newBuilder() + .setEncodedValue(BasicTypes.EncodedValue.newBuilder().setStringResult("value")))) + .build()); + ByteString bytes = builder.build().toByteString(); + PdxInstance value = (PdxInstance) serializer.deserialize(bytes); + + List<String> nested = (List<String>) value.getField("field1"); + assertEquals(Arrays.asList("value"), nested); + } + + + @Property(trials = 10) + public void testSymmetry( + @PdxInstanceGenerator.ClassName(ProtobufStructSerializer.PROTOBUF_STRUCT) @PdxInstanceGenerator.FieldTypes({ + String.class, int.class, long.class, byte.class, byte[].class, double.class, + PdxInstance.class, + ArrayList.class}) @From(PdxInstanceGenerator.class) PdxInstance original) + throws IOException, ClassNotFoundException { + ByteString bytes = serializer.serialize(original); + PdxInstance actual = (PdxInstance) serializer.deserialize(bytes); + assertThat(original).isEqualTo(actual); + assertEquals(actual, original); + } +} diff --cc gradle/wrapper/gradle-wrapper.jar index 2c6137b,2c6137b..286b6ae Binary files differ diff --cc gradle/wrapper/gradle-wrapper.properties index 2fad278,2fad278..b416c16 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@@ -1,4 -1,4 +1,4 @@@ --#Tue Jul 05 14:26:44 PDT 2016 ++#Wed Apr 18 15:55:39 PDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --cc gradlew index 9d82f78,9d82f78..4453cce --- a/gradlew +++ b/gradlew @@@ -1,4 -1,4 +1,4 @@@ --#!/usr/bin/env bash ++#!/usr/bin/env sh ############################################################################## ## @@@ -6,12 -6,12 +6,30 @@@ ## ############################################################################## --# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. --DEFAULT_JVM_OPTS="" ++# Attempt to set APP_HOME ++# Resolve links: $0 may be a link ++PRG="$0" ++# Need this for relative symlinks. ++while [ -h "$PRG" ] ; do ++ ls=`ls -ld "$PRG"` ++ link=`expr "$ls" : '.*-> \(.*\)$'` ++ if expr "$link" : '/.*' > /dev/null; then ++ PRG="$link" ++ else ++ PRG=`dirname "$PRG"`"/$link" ++ fi ++done ++SAVED="`pwd`" ++cd "`dirname \"$PRG\"`/" >/dev/null ++APP_HOME="`pwd -P`" ++cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` ++# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. ++DEFAULT_JVM_OPTS="" ++ # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@@ -30,6 -30,6 +48,7 @@@ die ( ) cygwin=false msys=false darwin=false ++nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@@ -40,26 -40,26 +59,11 @@@ MINGW* ) msys=true ;; ++ NONSTOP* ) ++ nonstop=true ++ ;; esac --# Attempt to set APP_HOME --# Resolve links: $0 may be a link --PRG="$0" --# Need this for relative symlinks. --while [ -h "$PRG" ] ; do -- ls=`ls -ld "$PRG"` -- link=`expr "$ls" : '.*-> \(.*\)$'` -- if expr "$link" : '/.*' > /dev/null; then -- PRG="$link" -- else -- PRG=`dirname "$PRG"`"/$link" -- fi --done --SAVED="`pwd`" --cd "`dirname \"$PRG\"`/" >/dev/null --APP_HOME="`pwd -P`" --cd "$SAVED" >/dev/null -- CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@@ -85,7 -85,7 +89,7 @@@ location of your Java installation. fi # Increase the maximum file descriptors if we can. --if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then ++if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@@ -150,11 -150,11 +154,19 @@@ if $cygwin ; the esac fi --# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules --function splitJvmOpts() { -- JVM_OPTS=("$@") ++# Escape application args ++save ( ) { ++ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done ++ echo " " } --eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS --JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" ++APP_ARGS=$(save "$@") ++ ++# Collect all arguments for the java command, following the shell quoting and substitution rules ++eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" ++ ++# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong ++if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then ++ cd "$(dirname "$0")" ++fi --exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" ++exec "$JAVACMD" "$@" diff --cc gradlew.bat index 72d362d,72d362d..e95643d --- a/gradlew.bat +++ b/gradlew.bat @@@ -8,14 -8,14 +8,14 @@@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal --@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. --set DEFAULT_JVM_OPTS= -- set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% ++@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. ++set DEFAULT_JVM_OPTS= ++ @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@@ -49,7 -49,7 +49,6 @@@ goto fai @rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args --if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@@ -60,11 -60,11 +59,6 @@@ set _SKIP= if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* --goto execute -- --:4NT_args --@rem Get arguments from the 4NT Shell from JP Software --set CMD_LINE_ARGS=%$ :execute @rem Setup the command line -- To stop receiving notification emails like this one, please contact [email protected].
