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 ed3ccdf Add generic type for FileRepositoryDeleteVisitor (#15196)
ed3ccdf is described below
commit ed3ccdf614b362fad83d8af4f2c52aaea0ddd38c
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 29 19:22:38 2022 +0800
Add generic type for FileRepositoryDeleteVisitor (#15196)
* Refactor MemoryContextManagerBuilder
* Add generic type for FileRepositoryDeleteVisitor
---
.../mode/manager/memory/MemoryContextManagerBuilder.java | 8 ++++----
.../mode/repository/standalone/file/FileRepository.java | 11 ++++++-----
.../standalone/file/FileRepositoryDeleteVisitor.java | 14 +++++++-------
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/MemoryContextManagerBuilder.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/MemoryContextManagerBuilder.java
index 0120552..7ba305e 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/MemoryContextManagerBuilder.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/MemoryContextManagerBuilder.java
@@ -48,7 +48,7 @@ public final class MemoryContextManagerBuilder implements
ContextManagerBuilder
TransactionContexts transactionContexts = new
TransactionContextsBuilder(metaDataContexts.getMetaDataMap(),
metaDataContexts.getGlobalRuleMetaData().getRules()).build();
ContextManager result = new ContextManager();
result.init(metaDataContexts, transactionContexts,
buildInstanceContext(parameter));
- buildSpecialRules(result);
+ setInstanceContext(result);
return result;
}
@@ -59,9 +59,9 @@ public final class MemoryContextManagerBuilder implements
ContextManagerBuilder
return new InstanceContext(instance, new MemoryWorkerIdGenerator(),
getType());
}
- private void buildSpecialRules(final ContextManager contextManager) {
- contextManager.getMetaDataContexts().getMetaDataMap().forEach((key,
value)
- -> value.getRuleMetaData().getRules().stream().filter(each -> each
instanceof InstanceAwareRule)
+ private void setInstanceContext(final ContextManager contextManager) {
+ contextManager.getMetaDataContexts().getMetaDataMap()
+ .forEach((key, value) ->
value.getRuleMetaData().getRules().stream().filter(each -> each instanceof
InstanceAwareRule)
.forEach(each -> ((InstanceAwareRule)
each).setInstanceContext(contextManager.getInstanceContext())));
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-repository/shardingsphere-standalone-mode-repository-provider/shardingsphere-standalone-mode-repository-file/src/main/java/org/apache/shardingsphere/mode/repository/standalone/file/FileRepository.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-repository/shardingsphere-standalone-mode-repository-provider/s
[...]
index e20e7c3..9cad283 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-repository/shardingsphere-standalone-mode-repository-provider/shardingsphere-standalone-mode-repository-file/src/main/java/org/apache/shardingsphere/mode/repository/standalone/file/FileRepository.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-repository/shardingsphere-standalone-mode-repository-provider/shardingsphere-standalone-mode-repository-file/src/main/java/org/apache/shardingsphere/mode/repository/standalone/file/FileRepository.java
@@ -70,10 +70,11 @@ public final class FileRepository implements
StandalonePersistRepository {
if (!file.exists()) {
return Collections.emptyList();
}
- return null != file.listFiles() ?
Arrays.stream(file.listFiles()).map(File::getName).collect(Collectors.toList())
- : Collections.emptyList();
+ File[] files = file.listFiles();
+ return null == files ? Collections.emptyList() :
Arrays.stream(files).map(File::getName).collect(Collectors.toList());
}
+ @SuppressWarnings("ResultOfMethodCallIgnored")
@Override
public void persist(final String key, final String value) {
File file = new File(path, key);
@@ -102,11 +103,11 @@ public final class FileRepository implements
StandalonePersistRepository {
}
@Override
- public String getType() {
- return "File";
+ public void close() {
}
@Override
- public void close() {
+ public String getType() {
+ return "File";
}
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-repository/shardingsphere-standalone-mode-repository-provider/shardingsphere-standalone-mode-repository-file/src/main/java/org/apache/shardingsphere/mode/repository/standalone/file/FileRepositoryDeleteVisitor.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-repository/shardingsphere-standalone-mode-reposito
[...]
index 2c47578..5d7e71b 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-repository/shardingsphere-standalone-mode-repository-provider/shardingsphere-standalone-mode-repository-file/src/main/java/org/apache/shardingsphere/mode/repository/standalone/file/FileRepositoryDeleteVisitor.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-repository/shardingsphere-standalone-mode-repository-provider/shardingsphere-standalone-mode-repository-file/src/main/java/org/apache/shardingsphere/mode/repository/standalone/file/FileRepositoryDeleteVisitor.java
@@ -27,27 +27,27 @@ import java.nio.file.attribute.BasicFileAttributes;
/**
* File repository delete visitor.
*/
-public final class FileRepositoryDeleteVisitor implements FileVisitor {
+public final class FileRepositoryDeleteVisitor implements FileVisitor<Path> {
@Override
- public FileVisitResult preVisitDirectory(final Object dir, final
BasicFileAttributes attrs) {
+ public FileVisitResult preVisitDirectory(final Path dir, final
BasicFileAttributes attrs) {
return FileVisitResult.CONTINUE;
}
@Override
- public FileVisitResult visitFile(final Object file, final
BasicFileAttributes attrs) throws IOException {
- Files.deleteIfExists((Path) file);
+ public FileVisitResult visitFile(final Path file, final
BasicFileAttributes attrs) throws IOException {
+ Files.deleteIfExists(file);
return FileVisitResult.CONTINUE;
}
@Override
- public FileVisitResult visitFileFailed(final Object file, final
IOException exc) {
+ public FileVisitResult visitFileFailed(final Path file, final IOException
exc) {
return FileVisitResult.CONTINUE;
}
@Override
- public FileVisitResult postVisitDirectory(final Object dir, final
IOException exc) throws IOException {
- Files.deleteIfExists((Path) dir);
+ public FileVisitResult postVisitDirectory(final Path dir, final
IOException exc) throws IOException {
+ Files.deleteIfExists(dir);
return FileVisitResult.CONTINUE;
}
}
