From 24936c5a022b38121f87ef412b42c3a445615aa5 Mon Sep 17 00:00:00 2001 From: tomsun28 Date: Sat, 6 Feb 2021 21:05:27 +0800 Subject: [PATCH] change contextPathRef to CONTEXT_PATH_REF --- .../usthe/sureness/matcher/PathTreeProvider.java | 13 +++++++++++-- .../annotation/AnnotationPathTreeProvider.java | 4 ++-- .../provider/ducument/DocumentPathTreeProvider.java | 4 ++-- .../ducument/DocumentResourceDefaultProvider.java | 4 ++-- .../sureness/provider/DatabasePathTreeProvider.java | 4 ++-- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/com/usthe/sureness/matcher/PathTreeProvider.java b/core/src/main/java/com/usthe/sureness/matcher/PathTreeProvider.java index 9fe11ce..8fa2ea7 100644 --- a/core/src/main/java/com/usthe/sureness/matcher/PathTreeProvider.java +++ b/core/src/main/java/com/usthe/sureness/matcher/PathTreeProvider.java @@ -16,7 +16,7 @@ public interface PathTreeProvider { * eg: springboot context path is: server.servlet.context-path = v2 * tomcat context path is: */ - AtomicReference contextPathRef = new AtomicReference(); + AtomicReference CONTEXT_PATH_REF = new AtomicReference<>(); /** * set context path @@ -24,7 +24,16 @@ public interface PathTreeProvider { * @param contextPath context path */ default void setContextPath(String contextPath) { - contextPathRef.set(contextPath); + CONTEXT_PATH_REF.set(contextPath); + } + + /** + * get context path + * Please sync with your server context path settings use setContextPath + * @return context path + */ + default String getContextPath() { + return CONTEXT_PATH_REF.get(); } /** diff --git a/core/src/main/java/com/usthe/sureness/provider/annotation/AnnotationPathTreeProvider.java b/core/src/main/java/com/usthe/sureness/provider/annotation/AnnotationPathTreeProvider.java index 6b1d3ad..8a4a8d9 100644 --- a/core/src/main/java/com/usthe/sureness/provider/annotation/AnnotationPathTreeProvider.java +++ b/core/src/main/java/com/usthe/sureness/provider/annotation/AnnotationPathTreeProvider.java @@ -77,7 +77,7 @@ public class AnnotationPathTreeProvider implements PathTreeProvider { } } } - return SurenessCommonUtil.attachContextPath(contextPathRef.get(), resource); + return SurenessCommonUtil.attachContextPath(getContextPath(), resource); } @Override @@ -100,7 +100,7 @@ public class AnnotationPathTreeProvider implements PathTreeProvider { } } } - return SurenessCommonUtil.attachContextPath(contextPathRef.get(), resource); + return SurenessCommonUtil.attachContextPath(getContextPath(), resource); } public List getScanPackages() { diff --git a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentPathTreeProvider.java b/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentPathTreeProvider.java index 37b40aa..c494ec0 100644 --- a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentPathTreeProvider.java +++ b/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentPathTreeProvider.java @@ -35,7 +35,7 @@ public class DocumentPathTreeProvider implements PathTreeProvider { } else { resourceSet = new HashSet<>(); } - return SurenessCommonUtil.attachContextPath(contextPathRef.get(), resourceSet); + return SurenessCommonUtil.attachContextPath(getContextPath(), resourceSet); } catch (IOException e) { logger.error("load config data from yaml file error: ", e); throw new SurenessLoadDataException(e.getMessage()); @@ -55,7 +55,7 @@ public class DocumentPathTreeProvider implements PathTreeProvider { } else { resourceSet = new HashSet<>(); } - return SurenessCommonUtil.attachContextPath(contextPathRef.get(), resourceSet); + return SurenessCommonUtil.attachContextPath(getContextPath(), resourceSet); } catch (IOException e) { logger.error("load config data from yaml file error: ", e); throw new SurenessLoadDataException(e.getMessage()); diff --git a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentResourceDefaultProvider.java b/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentResourceDefaultProvider.java index 8fe5709..9de8e09 100644 --- a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentResourceDefaultProvider.java +++ b/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentResourceDefaultProvider.java @@ -50,7 +50,7 @@ public class DocumentResourceDefaultProvider implements PathTreeProvider, Surene } else { resourceSet = new HashSet<>(); } - return SurenessCommonUtil.attachContextPath(contextPathRef.get(), resourceSet); + return SurenessCommonUtil.attachContextPath(getContextPath(), resourceSet); } catch (IOException e) { logger.error("load config data from yaml file error: ", e); throw new SurenessLoadDataException(e.getMessage()); @@ -70,7 +70,7 @@ public class DocumentResourceDefaultProvider implements PathTreeProvider, Surene } else { resourceSet = new HashSet<>(); } - return SurenessCommonUtil.attachContextPath(contextPathRef.get(), resourceSet); + return SurenessCommonUtil.attachContextPath(getContextPath(), resourceSet); } catch (IOException e) { logger.error("load config data from yaml file error: ", e); throw new SurenessLoadDataException(e.getMessage()); diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/provider/DatabasePathTreeProvider.java b/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/provider/DatabasePathTreeProvider.java index d84d523..7026474 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/provider/DatabasePathTreeProvider.java +++ b/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/provider/DatabasePathTreeProvider.java @@ -22,13 +22,13 @@ public class DatabasePathTreeProvider implements PathTreeProvider { @Override public Set providePathData() { - return SurenessCommonUtil.attachContextPath(contextPathRef.get(), resourceService.getAllEnableResourcePath()); + return SurenessCommonUtil.attachContextPath(getContextPath(), resourceService.getAllEnableResourcePath()); } @Override public Set provideExcludedResource() { - return SurenessCommonUtil.attachContextPath(contextPathRef.get(), resourceService.getAllDisableResourcePath()); + return SurenessCommonUtil.attachContextPath(getContextPath(), resourceService.getAllDisableResourcePath()); } } -- GitLab