Skip to content

Commit

Permalink
renaming RevisionNotExistError
Browse files Browse the repository at this point in the history
  • Loading branch information
江村 committed Oct 8, 2023
1 parent 0f8e047 commit 13b476e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
* @author xiaojian.xj
* @version $Id: RevisionNotExistException.java, v 0.1 2021年02月03日 15:59 xiaojian.xj Exp $
*/
public class RevisionNotExistException extends Error {
public class RevisionNotExistError extends Error {

public RevisionNotExistException(String revision) {
public RevisionNotExistError(String revision) {
super(String.format("revision: %s not exist.", revision));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import com.alipay.sofa.registry.jdbc.constant.TableEnum;
import com.alipay.sofa.registry.jdbc.convertor.AppRevisionDomainConvertor;
import com.alipay.sofa.registry.jdbc.domain.AppRevisionDomain;
import com.alipay.sofa.registry.jdbc.exception.RevisionNotExistException;
import com.alipay.sofa.registry.jdbc.exception.RevisionNotExistError;
import com.alipay.sofa.registry.jdbc.informer.BaseInformer;
import com.alipay.sofa.registry.jdbc.mapper.AppRevisionMapper;
import com.alipay.sofa.registry.log.Logger;
Expand Down Expand Up @@ -102,14 +102,14 @@ public AppRevision load(String revision) throws InterruptedException {
List<AppRevisionDomain> revisionDomains =
appRevisionMapper.queryRevision(dataCenters, revision);
if (CollectionUtils.isEmpty(revisionDomains)) {
throw new RevisionNotExistException(revision);
throw new RevisionNotExistError(revision);
}
for (AppRevisionDomain revisionDomain : revisionDomains) {
if (!revisionDomain.isDeleted()) {
return AppRevisionDomainConvertor.convert2Revision(revisionDomain);
}
}
throw new RevisionNotExistException(revision);
throw new RevisionNotExistError(revision);
}
});
CacheCleaner.autoClean(localRevisions, 1000 * 60 * 10);
Expand Down Expand Up @@ -176,7 +176,7 @@ public AppRevision queryRevision(String revision) {
LOG.error("jdbc query revision error, revision: {}", revision, e);
throw new RuntimeException("jdbc refresh revision failed", e);
} catch (ExecutionError e) {
if (e.getCause() instanceof RevisionNotExistException) {
if (e.getCause() instanceof RevisionNotExistError) {
LOG.info("jdbc query revision failed, revision: {} not exist in db", revision, e);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.alipay.sofa.registry.common.model.store.AppRevision;
import com.alipay.sofa.registry.core.model.AppRevisionInterface;
import com.alipay.sofa.registry.jdbc.AbstractH2DbTestBase;
import com.alipay.sofa.registry.jdbc.TestUtils;
import com.alipay.sofa.registry.jdbc.convertor.AppRevisionDomainConvertor;
import com.alipay.sofa.registry.jdbc.domain.AppRevisionDomain;
import com.alipay.sofa.registry.jdbc.mapper.AppRevisionMapper;
Expand All @@ -30,7 +29,6 @@
import com.alipay.sofa.registry.util.ConcurrentUtils;
import com.alipay.sofa.registry.util.LoopRunnable;
import com.google.common.cache.LoadingCache;
import com.google.common.util.concurrent.UncheckedExecutionException;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down

0 comments on commit 13b476e

Please sign in to comment.