This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git.
from 214b8d8 Revert "GEODE-7373: add jmx credential type constraint (#4236)" (#4265) add 77103d0 GEODE-7358: Membership code should use InternalDistributedMember as the membership identifier (#4230) No new revisions were added by this update. Summary of changes: .../cache30/DistributedAckRegionCCEDUnitTest.java | 7 +- .../apache/geode/cache30/ReconnectDUnitTest.java | 7 +- .../distributed/DistributedMemberDUnitTest.java | 10 +- .../distributed/DistributedSystemDUnitTest.java | 8 +- .../ClusterDistributionManagerDUnitTest.java | 4 +- .../TcpServerBackwardCompatDUnitTest.java | 4 +- .../tier/sockets/ClientServerMiscDUnitTest.java | 6 +- .../statistics/StatisticsDistributedTest.java | 4 +- .../cache/client/ClientCacheFactoryJUnitTest.java | 19 +- .../internal/membership/MembershipJUnitTest.java | 18 +- .../adapter/GMSMembershipManagerJUnitTest.java | 37 +- .../gms/fd/GMSHealthMonitorJUnitTest.java | 127 +++--- .../gms/locator/GMSLocatorIntegrationTest.java | 4 +- .../locator/GMSLocatorRecoveryIntegrationTest.java | 9 +- .../gms/membership/GMSJoinLeaveJUnitTest.java | 177 ++++---- .../gms/messenger/GMSEncryptJUnitTest.java | 11 +- .../gms/messenger/GMSQuorumCheckerJUnitTest.java | 79 ++-- .../gms/messenger/JGroupsMessengerJUnitTest.java | 95 ++-- .../CacheDistributionAdvisorConcurrentTest.java | 4 +- .../cache/FilterProfileConcurrencyTest.java | 3 +- .../codeAnalysis/sanctionedDataSerializables.txt | 52 +-- .../internal/SystemMemberBridgeServerJmxImpl.java | 1 - .../client/internal/ClientSideHandshakeImpl.java | 2 +- .../internal/ClusterDistributionManager.java | 34 +- .../internal/InternalDistributedSystem.java | 2 +- .../internal/LonerDistributionManager.java | 4 +- .../membership/InternalDistributedMember.java | 499 ++++++++++++--------- .../internal/membership/MemberAttributes.java | 126 ------ .../internal/membership/MembershipView.java | 2 +- .../distributed/internal/membership/NetMember.java | 115 ----- .../internal/membership/NetMemberFactory.java | 111 ----- .../membership/adapter/GMSMemberAdapter.java | 230 ---------- .../membership/adapter/GMSMembershipManager.java | 95 ++-- .../membership/adapter/GMSMessageAdapter.java | 33 +- .../membership/adapter/auth/GMSAuthenticator.java | 18 +- .../gms/{GMSMember.java => GMSMemberData.java} | 269 ++++------- .../internal/membership/gms/GMSMembershipView.java | 171 +++---- .../internal/membership/gms/GMSUtil.java | 60 +-- .../membership/gms/MemberDataBuilderImpl.java | 160 +++++++ .../gms/MemberIdentifierFactoryImpl.java} | 31 +- .../membership/gms/MembershipBuilderImpl.java | 13 +- .../internal/membership/gms/Services.java | 23 +- .../internal/membership/gms/SuspectMember.java | 10 +- .../internal/membership/gms/api/Authenticator.java | 6 +- .../internal/membership/gms/api/MemberData.java | 136 ++++++ .../membership/gms/api/MemberDataBuilder.java | 95 ++++ .../membership/gms/api/MemberIdentifier.java | 119 +++++ ...eListener.java => MemberIdentifierFactory.java} | 21 +- .../membership/gms/api/MembershipBuilder.java | 4 + .../membership/gms/fd/GMSHealthMonitor.java | 128 +++--- .../membership/gms/interfaces/GMSMessage.java | 12 +- .../membership/gms/interfaces/HealthMonitor.java | 10 +- .../membership/gms/interfaces/JoinLeave.java | 12 +- .../membership/gms/interfaces/Manager.java | 4 +- .../membership/gms/interfaces/Messenger.java | 20 +- .../membership/gms/interfaces/Service.java | 6 +- .../gms/locator/FindCoordinatorRequest.java | 29 +- .../gms/locator/FindCoordinatorResponse.java | 32 +- .../membership/gms/locator/GMSLocator.java | 40 +- .../membership/gms/membership/GMSJoinLeave.java | 289 ++++++------ .../gms/messages/AbstractGMSMessage.java | 20 +- .../gms/messages/FinalCheckPassedMessage.java | 15 +- .../membership/gms/messages/HasMemberID.java | 4 +- .../gms/messages/HeartbeatRequestMessage.java | 13 +- .../gms/messages/JoinRequestMessage.java | 13 +- .../gms/messages/JoinResponseMessage.java | 15 +- .../gms/messages/LeaveRequestMessage.java | 17 +- .../gms/messages/NetworkPartitionMessage.java | 4 +- .../gms/messages/RemoveMemberMessage.java | 17 +- .../gms/messages/SuspectMembersMessage.java | 9 +- .../membership/gms/messages/SuspectRequest.java | 8 +- .../membership/gms/messages/ViewAckMessage.java | 6 +- .../membership/gms/messenger/GMSEncrypt.java | 26 +- .../gms/messenger/GMSMemberWrapper.java} | 52 +-- .../membership/gms/messenger/GMSQuorumChecker.java | 28 +- .../membership/gms/messenger/JGAddress.java | 14 +- .../membership/gms/messenger/JGroupsMessenger.java | 122 ++--- .../gms/messenger/MembershipInformation.java | 8 +- .../org/apache/geode/internal/DSFIDFactory.java | 2 - .../geode/internal/InternalDataSerializer.java | 12 +- .../geode/internal/cache/CacheServerImpl.java | 4 +- .../org/apache/geode/internal/cache/EventID.java | 2 +- .../geode/internal/cache/EventStateHelper.java | 30 +- .../geode/internal/cache/PartitionedRegion.java | 4 +- .../cache/snapshot/ParallelSnapshotFileMapper.java | 2 +- .../internal/cache/tier/sockets/AcceptorImpl.java | 2 +- .../cache/tier/sockets/CacheClientUpdater.java | 10 +- .../tier/sockets/ClientProxyMembershipID.java | 18 +- .../geode/management/internal/MBeanJMXAdapter.java | 2 +- .../membership/InternalDistributedMemberTest.java | 25 +- .../membership/MembershipViewJUnitTest.java | 99 ++-- .../auth/AbstractGMSAuthenticatorTestCase.java | 4 +- ...rJUnitTest.java => GMSMemberDataJUnitTest.java} | 85 ++-- .../membership/gms/MemberDataBuilderImplTest.java | 152 +++++++ .../gms/MemberIdentifierFactoryImplTest.java | 132 ++++++ .../gms/api/MembershipAPIArchUnitTest.java | 5 +- .../snapshot/ParallelSnapshotFileMapperTest.java | 4 +- .../management/internal/FederatingManagerTest.java | 2 +- .../management/internal/LocalManagerTest.java | 2 +- .../cli/commands/ExportLogsCommandTest.java | 10 +- .../cache/tier/sockets/DurableClientTestCase.java | 2 + .../management/CacheServerManagementDUnitTest.java | 2 +- .../apache/geode/cache30/ClientServerTestCase.java | 2 +- .../internal/serialization/DSFIDSerializer.java | 2 - .../serialization/DSFIDSerializerImpl.java | 12 - .../serialization/DataSerializableFixedID.java | 2 +- .../internal/serialization/ObjectSerializer.java | 7 - 107 files changed, 2424 insertions(+), 2261 deletions(-) delete mode 100755 geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java delete mode 100755 geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java delete mode 100644 geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMemberFactory.java delete mode 100644 geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMemberAdapter.java rename geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/{GMSMember.java => GMSMemberData.java} (72%) mode change 100755 => 100644 create mode 100644 geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/MemberDataBuilderImpl.java copy geode-core/src/main/java/org/apache/geode/{internal/sequencelog/MessageLogger.java => distributed/internal/membership/gms/MemberIdentifierFactoryImpl.java} (52%) create mode 100644 geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/api/MemberData.java create mode 100644 geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/api/MemberDataBuilder.java create mode 100644 geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/api/MemberIdentifier.java copy geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/api/{MessageListener.java => MemberIdentifierFactory.java} (57%) mode change 100755 => 100644 copy geode-core/src/{distributedTest/java/org/apache/geode/cache30/TestPdxSerializer.java => main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSMemberWrapper.java} (53%) rename geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/{GMSMemberJUnitTest.java => GMSMemberDataJUnitTest.java} (66%) create mode 100644 geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/MemberDataBuilderImplTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/MemberIdentifierFactoryImplTest.java