diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filedb/FileDatabaseService.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filedb/FileDatabaseService.java index 9d054f01..99809897 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filedb/FileDatabaseService.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/filedb/FileDatabaseService.java @@ -45,7 +45,7 @@ import cn.axzo.nanopart.doc.entity.IndexNode; import cn.axzo.nanopart.doc.entity.TemplateDatabase; import cn.axzo.nanopart.doc.file.index.IndexManager; import cn.axzo.nanopart.doc.file.index.IndexQueryService; -import cn.axzo.nanopart.doc.file.index.copy.CopiedOssFiles; +import cn.axzo.nanopart.doc.file.index.copy.OssFilesCopy; import cn.axzo.nanopart.doc.file.index.copy.SetScopeCopyFileVisitor; import cn.axzo.nanopart.doc.file.index.domain.IndexNodes; import cn.axzo.nanopart.doc.file.templatedb.TemplateDatabaseQueryService; @@ -123,12 +123,12 @@ public class FileDatabaseService { private Future asyncCopySubtree(FileDatabase db, IndexNode templateRoot, @Nullable Runnable postProcessor) { return indexManager.async(() -> { // don't inline in transaction - CopiedOssFiles copiedOssFiles = indexManager.copySubtreeOssFiles(templateRoot); + OssFilesCopy filesCopy = indexManager.copySubtreeOssFiles(templateRoot); transaction.executeWithoutResult(unused -> { FileDatabase reload = fileDatabaseDao.getForUpdateOrThrow(db.getCode()); if (reload.isActivated()) return; - indexManager.copySubTree(templateRoot, null, new SetScopeCopyFileVisitor(copiedOssFiles, db)); + indexManager.copySubTree(templateRoot, null, new SetScopeCopyFileVisitor(filesCopy, db)); fileDatabaseDao.updateState(db.getCode(), FileDatabaseState.ACTIVATED); fileDatabaseDao.setPurchaseTime(db.getCode(), new Date()); if (postProcessor != null) diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java index 90ae521a..d4f2a220 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java @@ -25,7 +25,7 @@ import cn.axzo.nanopart.doc.dao.DocLogDao; import cn.axzo.nanopart.doc.dao.IndexNodeDao; import cn.axzo.nanopart.doc.entity.IndexNode; import cn.axzo.nanopart.doc.file.index.copy.ConnectNodeVisitor; -import cn.axzo.nanopart.doc.file.index.copy.CopiedOssFiles; +import cn.axzo.nanopart.doc.file.index.copy.OssFilesCopy; import cn.axzo.nanopart.doc.file.index.copy.CopyFileVisitor; import cn.axzo.nanopart.doc.file.index.copy.CopyNodeVisitor; import cn.axzo.nanopart.doc.file.index.domain.NameUsedException; @@ -157,10 +157,10 @@ public class IndexManager { return subtree; } - public CopiedOssFiles copySubtreeOssFiles(IndexNode srcNode) { + public OssFilesCopy copySubtreeOssFiles(IndexNode srcNode) { BizAssertions.assertFalse(TransactionSynchronizationManager.isActualTransactionActive(), "不能在事务中使用"); List ossFileKeys = indexNodeDao.collectValidSubtreeFileOssKeys(srcNode); - return new CopiedOssFiles(ossClient.copy(ossFileKeys)); + return new OssFilesCopy(ossClient.copy(ossFileKeys)); } /** diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/CopyFileVisitor.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/CopyFileVisitor.java index 95dc316f..c2179fee 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/CopyFileVisitor.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/CopyFileVisitor.java @@ -13,14 +13,14 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public class CopyFileVisitor extends CopyNodeVisitor { - private final CopiedOssFiles copiedOssFiles; + private final OssFilesCopy ossFilesCopy; @Override public WalkingDecision visit(ValueNode node) { IndexNode copy = node.getValue(); if (copy.isFile()) { FileAttributes fileAttributes = copy.getOrCreateFileAttributes(); - String newOssFileKey = copiedOssFiles.getCopyOssFileKey(fileAttributes.getOssFileKey()); + String newOssFileKey = ossFilesCopy.getCopyOssFileKey(fileAttributes.getOssFileKey()); fileAttributes.setOssFileKey(newOssFileKey); } return super.visit(node); diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/CopiedOssFiles.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/OssFilesCopy.java similarity index 91% rename from doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/CopiedOssFiles.java rename to doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/OssFilesCopy.java index e05d5ad5..42ba1466 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/CopiedOssFiles.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/OssFilesCopy.java @@ -9,7 +9,7 @@ import lombok.RequiredArgsConstructor; * @author yanglin */ @RequiredArgsConstructor -public class CopiedOssFiles { +public class OssFilesCopy { private final Map old2newOssFileKey; diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/SetScopeCopyFileVisitor.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/SetScopeCopyFileVisitor.java index b2415ff0..b02e3542 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/SetScopeCopyFileVisitor.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/copy/SetScopeCopyFileVisitor.java @@ -13,8 +13,8 @@ public class SetScopeCopyFileVisitor extends CopyFileVisitor { private final IndexNodeScope nodeScope; - public SetScopeCopyFileVisitor(CopiedOssFiles copiedOssFiles, IndexNodeScope nodeScope) { - super(copiedOssFiles); + public SetScopeCopyFileVisitor(OssFilesCopy ossFilesCopy, IndexNodeScope nodeScope) { + super(ossFilesCopy); this.nodeScope = nodeScope; }