You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/10/27 04:58:14 UTC
[shardingsphere] branch master updated: refractored Charsets to
StandardCharsets Fixes #7884 (#7888)
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 3dedfcb refractored Charsets to StandardCharsets Fixes #7884 (#7888)
3dedfcb is described below
commit 3dedfcb1dca543958ddc1b4993427fc36178fee0
Author: Tanvesh Takawale <36...@users.noreply.github.com>
AuthorDate: Tue Oct 27 10:27:42 2020 +0530
refractored Charsets to StandardCharsets Fixes #7884 (#7888)
* refractored Charsets to StandardCharsets
* fixed checkstyle
* checkstyle bug fix
---
.../governance/repository/etcd/EtcdRepository.java | 23 +++++++++++-----------
.../repository/etcd/EtcdRepositoryTest.java | 6 +++---
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/main/java/org/apache/shardingsphere/governance/repository/etcd/EtcdRepository.java b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/main/java/org/apache/shardingsphere/governance/repository/etcd/EtcdRepository.java
index 2170d5d..4b8e551 100644
--- a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/main/java/org/apache/shardingsphere/governance/repository/etcd/EtcdRepository.java
+++ b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/main/java/org/apache/shardingsphere/governance/repository/etcd/EtcdRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.governance.repository.etcd;
-import com.google.common.base.Charsets;
+import java.nio.charset.StandardCharsets;
import com.google.common.base.Splitter;
import io.etcd.jetcd.ByteSequence;
import io.etcd.jetcd.Client;
@@ -59,24 +59,24 @@ public final class EtcdRepository implements ConfigurationRepository, RegistryRe
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
etcdProperties = new EtcdProperties(props);
- client = Client.builder().endpoints(Util.toURIs(Splitter.on(",").trimResults().splitToList(config.getServerLists()))).namespace(ByteSequence.from(name, Charsets.UTF_8)).build();
+ client = Client.builder().endpoints(Util.toURIs(Splitter.on(",").trimResults().splitToList(config.getServerLists()))).namespace(ByteSequence.from(name, StandardCharsets.UTF_8)).build();
}
@SneakyThrows({InterruptedException.class, ExecutionException.class})
@Override
public String get(final String key) {
- List<KeyValue> keyValues = client.getKVClient().get(ByteSequence.from(key, Charsets.UTF_8)).get().getKvs();
- return keyValues.isEmpty() ? null : keyValues.iterator().next().getValue().toString(Charsets.UTF_8);
+ List<KeyValue> keyValues = client.getKVClient().get(ByteSequence.from(key, StandardCharsets.UTF_8)).get().getKvs();
+ return keyValues.isEmpty() ? null : keyValues.iterator().next().getValue().toString(StandardCharsets.UTF_8);
}
@SneakyThrows({InterruptedException.class, ExecutionException.class})
@Override
public List<String> getChildrenKeys(final String key) {
String prefix = key + PATH_SEPARATOR;
- ByteSequence prefixByteSequence = ByteSequence.from(prefix, Charsets.UTF_8);
+ ByteSequence prefixByteSequence = ByteSequence.from(prefix, StandardCharsets.UTF_8);
GetOption getOption = GetOption.newBuilder().withPrefix(prefixByteSequence).withSortField(GetOption.SortTarget.KEY).withSortOrder(GetOption.SortOrder.ASCEND).build();
List<KeyValue> keyValues = client.getKVClient().get(prefixByteSequence, getOption).get().getKvs();
- return keyValues.stream().map(e -> getSubNodeKeyName(prefix, e.getKey().toString(Charsets.UTF_8))).distinct().collect(Collectors.toList());
+ return keyValues.stream().map(e -> getSubNodeKeyName(prefix, e.getKey().toString(StandardCharsets.UTF_8))).distinct().collect(Collectors.toList());
}
private String getSubNodeKeyName(final String prefix, final String fullPath) {
@@ -87,7 +87,7 @@ public final class EtcdRepository implements ConfigurationRepository, RegistryRe
@SneakyThrows({InterruptedException.class, ExecutionException.class})
@Override
public void persist(final String key, final String value) {
- client.getKVClient().put(ByteSequence.from(key, Charsets.UTF_8), ByteSequence.from(value, Charsets.UTF_8)).get();
+ client.getKVClient().put(ByteSequence.from(key, StandardCharsets.UTF_8), ByteSequence.from(value, StandardCharsets.UTF_8)).get();
}
@SneakyThrows({InterruptedException.class, ExecutionException.class})
@@ -95,12 +95,12 @@ public final class EtcdRepository implements ConfigurationRepository, RegistryRe
public void persistEphemeral(final String key, final String value) {
long leaseId = client.getLeaseClient().grant(etcdProperties.getValue(EtcdPropertyKey.TIME_TO_LIVE_SECONDS)).get().getID();
client.getLeaseClient().keepAlive(leaseId, Observers.observer(response -> { }));
- client.getKVClient().put(ByteSequence.from(key, Charsets.UTF_8), ByteSequence.from(value, Charsets.UTF_8), PutOption.newBuilder().withLeaseId(leaseId).build()).get();
+ client.getKVClient().put(ByteSequence.from(key, StandardCharsets.UTF_8), ByteSequence.from(value, StandardCharsets.UTF_8), PutOption.newBuilder().withLeaseId(leaseId).build()).get();
}
@Override
public void delete(final String key) {
- client.getKVClient().delete(ByteSequence.from(key, Charsets.UTF_8));
+ client.getKVClient().delete(ByteSequence.from(key, StandardCharsets.UTF_8));
}
@Override
@@ -109,11 +109,12 @@ public final class EtcdRepository implements ConfigurationRepository, RegistryRe
for (WatchEvent each : response.getEvents()) {
ChangedType changedType = getEventChangedType(each);
if (ChangedType.IGNORED != changedType) {
- dataChangedEventListener.onChange(new DataChangedEvent(each.getKeyValue().getKey().toString(Charsets.UTF_8), each.getKeyValue().getValue().toString(Charsets.UTF_8), changedType));
+ dataChangedEventListener.onChange(new DataChangedEvent(each.getKeyValue().getKey().toString(StandardCharsets.UTF_8),
+ each.getKeyValue().getValue().toString(StandardCharsets.UTF_8), changedType));
}
}
});
- client.getWatchClient().watch(ByteSequence.from(key, Charsets.UTF_8), listener);
+ client.getWatchClient().watch(ByteSequence.from(key, StandardCharsets.UTF_8), listener);
}
private ChangedType getEventChangedType(final WatchEvent event) {
diff --git a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/test/java/org/apache/shardingsphere/governance/repository/etcd/EtcdRepositoryTest.java b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/test/java/org/apache/shardingsphere/governance/repository/etcd/EtcdRepositoryTest.java
index a5b7895..9be09fd 100644
--- a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/test/java/org/apache/shardingsphere/governance/repository/etcd/EtcdRepositoryTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/test/java/org/apache/shardingsphere/governance/repository/etcd/EtcdRepositoryTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.governance.repository.etcd;
-import com.google.common.base.Charsets;
+import java.nio.charset.StandardCharsets;
import com.google.protobuf.ByteString;
import io.etcd.jetcd.ByteSequence;
import io.etcd.jetcd.Client;
@@ -130,7 +130,7 @@ public final class EtcdRepositoryTest {
@Test
public void assertGetKey() {
repository.get("key");
- verify(kv).get(ByteSequence.from("key", Charsets.UTF_8));
+ verify(kv).get(ByteSequence.from("key", StandardCharsets.UTF_8));
verify(getResponse).getKvs();
}
@@ -200,7 +200,7 @@ public final class EtcdRepositoryTest {
@Test
public void assertDelete() {
repository.delete("key");
- verify(kv).delete(ByteSequence.from("key", Charsets.UTF_8));
+ verify(kv).delete(ByteSequence.from("key", StandardCharsets.UTF_8));
}
@Test