This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new b4436d0 Merge UserRuleChangedEvent and PrivilegeChangedEvent to
AuthorityChangedEvent (#10027)
b4436d0 is described below
commit b4436d05ab03d376c4dcfd7060ded610a5bde746
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Apr 10 21:13:37 2021 +0800
Merge UserRuleChangedEvent and PrivilegeChangedEvent to
AuthorityChangedEvent (#10027)
---
.../authority/GovernanceAuthorityContext.java | 20 +++----------
.../metadata/GovernanceMetaDataContexts.java | 6 ++--
.../metadata/GovernanceMetaDataContextsTest.java | 6 ++--
.../event/model/auth/UserRuleChangedEvent.java | 35 ----------------------
.../AuthorityChangedEvent.java} | 6 ++--
.../listener/PrivilegeNodeChangedListener.java | 6 ++--
.../registry/listener/RegistryListenerManager.java | 4 +--
...angedListener.java => UserChangedListener.java} | 10 +++----
....java => PrivilegeNodeChangedListenerTest.java} | 18 +++++------
...tenerTest.java => UserChangedListenerTest.java} | 13 ++++----
10 files changed, 35 insertions(+), 89 deletions(-)
diff --git
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/GovernanceAuthorityContext.java
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/GovernanceAuthorityContext.java
index 54beaf8..ec888ad 100644
---
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/GovernanceAuthorityContext.java
+++
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/GovernanceAuthorityContext.java
@@ -23,8 +23,7 @@ import lombok.Setter;
import org.apache.shardingsphere.authority.AuthorityContext;
import
org.apache.shardingsphere.authority.api.config.AuthorityRuleConfiguration;
import org.apache.shardingsphere.authority.spi.AuthorityProvideAlgorithm;
-import
org.apache.shardingsphere.governance.core.event.model.auth.PrivilegeChangedEvent;
-import
org.apache.shardingsphere.governance.core.event.model.auth.UserRuleChangedEvent;
+import
org.apache.shardingsphere.governance.core.event.model.authority.AuthorityChangedEvent;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmFactory;
import
org.apache.shardingsphere.infra.context.metadata.MetaDataAwareEventSubscriber;
import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
@@ -42,26 +41,15 @@ public final class GovernanceAuthorityContext implements
MetaDataAwareEventSubsc
private volatile MetaDataContexts metaDataContexts;
/**
- * Renew user.
+ * Renew authority.
*
- * @param event user changed event
+ * @param event authority changed event
*/
- // TODO consider about merge UserRuleChangedEvent and PrivilegeChangedEvent
@Subscribe
- public synchronized void renew(final UserRuleChangedEvent event) {
+ public synchronized void renew(final AuthorityChangedEvent event) {
reloadAuthority(event.getUsers());
}
- /**
- * Renew privilege.
- *
- * @param event privilege changed event
- */
- @Subscribe
- public synchronized void renew(final PrivilegeChangedEvent event) {
- reloadAuthority(event.getUsers());
- }
-
private void reloadAuthority(final Collection<ShardingSphereUser> users) {
Optional<AuthorityRuleConfiguration> authorityRuleConfig =
metaDataContexts.getGlobalRuleMetaData().getConfigurations().stream().filter(
each -> each instanceof
AuthorityRuleConfiguration).findAny().map(each -> (AuthorityRuleConfiguration)
each);
diff --git
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
index dc74e0e..bc0c456 100644
---
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
+++
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.context.metadata;
import com.google.common.collect.Maps;
import com.google.common.eventbus.Subscribe;
-import
org.apache.shardingsphere.governance.core.event.model.auth.UserRuleChangedEvent;
+import
org.apache.shardingsphere.governance.core.event.model.authority.AuthorityChangedEvent;
import
org.apache.shardingsphere.governance.core.event.model.datasource.DataSourceChangeCompletedEvent;
import
org.apache.shardingsphere.governance.core.event.model.datasource.DataSourceChangedEvent;
import
org.apache.shardingsphere.governance.core.event.model.metadata.MetaDataChangedEvent;
@@ -215,10 +215,10 @@ public final class GovernanceMetaDataContexts implements
MetaDataContexts {
/**
* Renew authority.
*
- * @param event user rule changed event
+ * @param event authority changed event
*/
@Subscribe
- public synchronized void renew(final UserRuleChangedEvent event) {
+ public synchronized void renew(final AuthorityChangedEvent event) {
Collection<ShardingSphereUser> users = new
HashSet<>(getNewUsers(event.getUsers()));
users.addAll(getModifiedUsers(event.getUsers()));
metaDataContexts = new StandardMetaDataContexts(
diff --git
a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
index 916a67c..0f103dd 100644
---
a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
@@ -17,8 +17,7 @@
package org.apache.shardingsphere.governance.context.metadata;
-import
org.apache.shardingsphere.authority.algorithm.natived.NativeAuthorityProviderAlgorithm;
-import
org.apache.shardingsphere.governance.core.event.model.auth.UserRuleChangedEvent;
+import
org.apache.shardingsphere.governance.core.event.model.authority.AuthorityChangedEvent;
import
org.apache.shardingsphere.governance.core.event.model.datasource.DataSourceChangedEvent;
import
org.apache.shardingsphere.governance.core.event.model.metadata.MetaDataDeletedEvent;
import
org.apache.shardingsphere.governance.core.event.model.metadata.MetaDataPersistedEvent;
@@ -159,8 +158,7 @@ public final class GovernanceMetaDataContextsTest {
@Test
public void assertAuthorityChanged() {
- NativeAuthorityProviderAlgorithm authority = new
NativeAuthorityProviderAlgorithm();
- UserRuleChangedEvent event = new
UserRuleChangedEvent(Collections.singleton(mock(ShardingSphereUser.class)));
+ AuthorityChangedEvent event = new
AuthorityChangedEvent(Collections.singleton(mock(ShardingSphereUser.class)));
governanceMetaDataContexts.renew(event);
assertThat(governanceMetaDataContexts.getUsers().getUsers().size(),
is(1));
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/auth/UserRuleChangedEvent.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/auth/UserRuleChangedEvent.java
deleted file mode 100644
index f360e9d..0000000
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/auth/UserRuleChangedEvent.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.shardingsphere.governance.core.event.model.auth;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.governance.core.event.model.GovernanceEvent;
-import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
-
-import java.util.Collection;
-
-/**
- * User rule changed event.
- */
-@RequiredArgsConstructor
-@Getter
-public final class UserRuleChangedEvent implements GovernanceEvent {
-
- private final Collection<ShardingSphereUser> users;
-}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/auth/PrivilegeChangedEvent.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/authority/AuthorityChangedEvent.java
similarity index 92%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/auth/PrivilegeChangedEvent.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/authority/AuthorityChangedEvent.java
index 7eb03c3..796140e 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/auth/PrivilegeChangedEvent.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/authority/AuthorityChangedEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.event.model.auth;
+package org.apache.shardingsphere.governance.core.event.model.authority;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -25,11 +25,11 @@ import
org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import java.util.Collection;
/**
- * Privilege changed event.
+ * Authority changed event.
*/
@RequiredArgsConstructor
@Getter
-public final class PrivilegeChangedEvent implements GovernanceEvent {
+public final class AuthorityChangedEvent implements GovernanceEvent {
private final Collection<ShardingSphereUser> users;
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/PrivilegeNodeChangedListener.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/PrivilegeNodeChangedListener.java
index 67e0c4b..d22a711 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/PrivilegeNodeChangedListener.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/PrivilegeNodeChangedListener.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.governance.core.registry.listener;
import
org.apache.shardingsphere.governance.core.event.listener.PostGovernanceRepositoryEventListener;
import org.apache.shardingsphere.governance.core.event.model.GovernanceEvent;
-import
org.apache.shardingsphere.governance.core.event.model.auth.PrivilegeChangedEvent;
+import
org.apache.shardingsphere.governance.core.event.model.authority.AuthorityChangedEvent;
import org.apache.shardingsphere.governance.core.registry.RegistryCenterNode;
import
org.apache.shardingsphere.governance.core.yaml.config.YamlConfigurationConverter;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
@@ -29,7 +29,7 @@ import java.util.Collections;
import java.util.Optional;
/**
- * Authentication changed listener.
+ * Privilege changed listener.
*/
public final class PrivilegeNodeChangedListener extends
PostGovernanceRepositoryEventListener<GovernanceEvent> {
@@ -39,6 +39,6 @@ public final class PrivilegeNodeChangedListener extends
PostGovernanceRepository
@Override
protected Optional<GovernanceEvent> createEvent(final DataChangedEvent
event) {
- return Optional.of(new
PrivilegeChangedEvent(YamlConfigurationConverter.convertUsers(event.getValue())));
+ return Optional.of(new
AuthorityChangedEvent(YamlConfigurationConverter.convertUsers(event.getValue())));
}
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManager.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManager.java
index 03bceda..29ace4a 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManager.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManager.java
@@ -38,7 +38,7 @@ public final class RegistryListenerManager {
private final PropertiesChangedListener propertiesChangedListener;
- private final AuthenticationChangedListener authenticationChangedListener;
+ private final UserChangedListener authenticationChangedListener;
private final PrivilegeNodeChangedListener privilegeNodeChangedListener;
@@ -48,7 +48,7 @@ public final class RegistryListenerManager {
lockChangedListener = new LockChangedListener(registryRepository);
metaDataListener = new MetaDataListener(registryRepository,
schemaNames);
propertiesChangedListener = new
PropertiesChangedListener(registryRepository);
- authenticationChangedListener = new
AuthenticationChangedListener(registryRepository);
+ authenticationChangedListener = new
UserChangedListener(registryRepository);
privilegeNodeChangedListener = new
PrivilegeNodeChangedListener(registryRepository);
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/AuthenticationChangedListener.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/UserChangedListener.java
similarity index 82%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/AuthenticationChangedListener.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/UserChangedListener.java
index 64ff6b0..24db016 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/AuthenticationChangedListener.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/UserChangedListener.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.governance.core.registry.listener;
import
org.apache.shardingsphere.governance.core.event.listener.PostGovernanceRepositoryEventListener;
import org.apache.shardingsphere.governance.core.event.model.GovernanceEvent;
-import
org.apache.shardingsphere.governance.core.event.model.auth.UserRuleChangedEvent;
+import
org.apache.shardingsphere.governance.core.event.model.authority.AuthorityChangedEvent;
import org.apache.shardingsphere.governance.core.registry.RegistryCenterNode;
import
org.apache.shardingsphere.governance.core.yaml.config.YamlConfigurationConverter;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
@@ -29,16 +29,16 @@ import java.util.Collections;
import java.util.Optional;
/**
- * Authentication changed listener.
+ * User changed listener.
*/
-public final class AuthenticationChangedListener extends
PostGovernanceRepositoryEventListener<GovernanceEvent> {
+public final class UserChangedListener extends
PostGovernanceRepositoryEventListener<GovernanceEvent> {
- public AuthenticationChangedListener(final RegistryRepository
registryRepository) {
+ public UserChangedListener(final RegistryRepository registryRepository) {
super(registryRepository, Collections.singletonList(new
RegistryCenterNode().getUsersNode()));
}
@Override
protected Optional<GovernanceEvent> createEvent(final DataChangedEvent
event) {
- return Optional.of(new
UserRuleChangedEvent(YamlConfigurationConverter.convertUsers(event.getValue())));
+ return Optional.of(new
AuthorityChangedEvent(YamlConfigurationConverter.convertUsers(event.getValue())));
}
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/AuthenticationChangedListenerTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/PrivilegeNodeChangedListenerTest.java
similarity index 74%
copy from
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/AuthenticationChangedListenerTest.java
copy to
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/PrivilegeNodeChangedListenerTest.java
index 2793a6d..e0be3d8 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/AuthenticationChangedListenerTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/PrivilegeNodeChangedListenerTest.java
@@ -5,7 +5,7 @@
* 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
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.core.registry.listener;
import org.apache.shardingsphere.governance.core.event.model.GovernanceEvent;
-import
org.apache.shardingsphere.governance.core.event.model.auth.UserRuleChangedEvent;
+import
org.apache.shardingsphere.governance.core.event.model.authority.AuthorityChangedEvent;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import
org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import
org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
@@ -26,9 +26,7 @@ import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import java.util.Optional;
@@ -36,27 +34,25 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-@RunWith(MockitoJUnitRunner.class)
-public final class AuthenticationChangedListenerTest {
+public final class PrivilegeNodeChangedListenerTest {
private static final String AUTHENTICATION_YAML = "- root1@:root1\n" + "-
root2@:root2\n";
- private AuthenticationChangedListener authenticationChangedListener;
+ private PrivilegeNodeChangedListener privilegeNodeChangedListener;
@Mock
private RegistryRepository registryRepository;
@Before
public void setUp() {
- authenticationChangedListener = new
AuthenticationChangedListener(registryRepository);
+ privilegeNodeChangedListener = new
PrivilegeNodeChangedListener(registryRepository);
}
@Test
public void assertCreateEvent() {
- Optional<GovernanceEvent> actual =
authenticationChangedListener.createEvent(new DataChangedEvent("test",
AUTHENTICATION_YAML, Type.UPDATED));
+ Optional<GovernanceEvent> actual =
privilegeNodeChangedListener.createEvent(new DataChangedEvent("test",
AUTHENTICATION_YAML, Type.UPDATED));
assertTrue(actual.isPresent());
- Optional<ShardingSphereUser> user =
- ((UserRuleChangedEvent)
actual.get()).getUsers().stream().filter(each -> each.getGrantee().equals(new
Grantee("root1", ""))).findFirst();
+ Optional<ShardingSphereUser> user = ((AuthorityChangedEvent)
actual.get()).getUsers().stream().filter(each -> each.getGrantee().equals(new
Grantee("root1", ""))).findFirst();
assertTrue(user.isPresent());
assertThat(user.get().getPassword(), is("root1"));
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/AuthenticationChangedListenerTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/UserChangedListenerTest.java
similarity index 78%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/AuthenticationChangedListenerTest.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/UserChangedListenerTest.java
index 2793a6d..fa71c7b 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/AuthenticationChangedListenerTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/UserChangedListenerTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.core.registry.listener;
import org.apache.shardingsphere.governance.core.event.model.GovernanceEvent;
-import
org.apache.shardingsphere.governance.core.event.model.auth.UserRuleChangedEvent;
+import
org.apache.shardingsphere.governance.core.event.model.authority.AuthorityChangedEvent;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import
org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import
org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
@@ -37,26 +37,25 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@RunWith(MockitoJUnitRunner.class)
-public final class AuthenticationChangedListenerTest {
+public final class UserChangedListenerTest {
private static final String AUTHENTICATION_YAML = "- root1@:root1\n" + "-
root2@:root2\n";
- private AuthenticationChangedListener authenticationChangedListener;
+ private UserChangedListener userChangedListener;
@Mock
private RegistryRepository registryRepository;
@Before
public void setUp() {
- authenticationChangedListener = new
AuthenticationChangedListener(registryRepository);
+ userChangedListener = new UserChangedListener(registryRepository);
}
@Test
public void assertCreateEvent() {
- Optional<GovernanceEvent> actual =
authenticationChangedListener.createEvent(new DataChangedEvent("test",
AUTHENTICATION_YAML, Type.UPDATED));
+ Optional<GovernanceEvent> actual = userChangedListener.createEvent(new
DataChangedEvent("test", AUTHENTICATION_YAML, Type.UPDATED));
assertTrue(actual.isPresent());
- Optional<ShardingSphereUser> user =
- ((UserRuleChangedEvent)
actual.get()).getUsers().stream().filter(each -> each.getGrantee().equals(new
Grantee("root1", ""))).findFirst();
+ Optional<ShardingSphereUser> user = ((AuthorityChangedEvent)
actual.get()).getUsers().stream().filter(each -> each.getGrantee().equals(new
Grantee("root1", ""))).findFirst();
assertTrue(user.isPresent());
assertThat(user.get().getPassword(), is("root1"));
}
