lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加"redkale.resource.skip.check"系统变量

Browse Source
This commit is contained in:
Redkale
2022-12-18 23:52:02 +08:00
parent 4fa449990f
commit 321ce372d2
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/redkale/mq/HttpMessageLocalClient.java
View File

@@ -16,7 +16,6 @@ import org.redkale.boot.*;
import org.redkale.convert.*; import org.redkale.convert.*;
import org.redkale.convert.json.JsonConvert; import org.redkale.convert.json.JsonConvert;
import org.redkale.net.http.*; import org.redkale.net.http.*;
import org.redkale.util.Traces;
/** /**
* 没有配置MQ且也没有ClusterAgent的情况下实现的默认HttpMessageClient实例 * 没有配置MQ且也没有ClusterAgent的情况下实现的默认HttpMessageClient实例
@@ -103,7 +102,6 @@ public class HttpMessageLocalClient extends HttpMessageClient {
} }
HttpRequest req = new HttpMessageLocalRequest(context(), request, userid); HttpRequest req = new HttpMessageLocalRequest(context(), request, userid);
HttpResponse resp = new HttpMessageLocalResponse(req, future); HttpResponse resp = new HttpMessageLocalResponse(req, future);
Traces.computeCurrTraceid(request.getTraceid());
try { try {
servlet.execute(req, resp); servlet.execute(req, resp);
} catch (Exception e) { } catch (Exception e) {
@@ -122,7 +120,6 @@ public class HttpMessageLocalClient extends HttpMessageClient {
HttpRequest req = new HttpMessageLocalRequest(context(), request, userid); HttpRequest req = new HttpMessageLocalRequest(context(), request, userid);
CompletableFuture future = new CompletableFuture(); CompletableFuture future = new CompletableFuture();
HttpResponse resp = new HttpMessageLocalResponse(req, future); HttpResponse resp = new HttpMessageLocalResponse(req, future);
Traces.computeCurrTraceid(request.getTraceid());
try { try {
servlet.execute(req, resp); servlet.execute(req, resp);
} catch (Exception e) { } catch (Exception e) {
@@ -149,7 +146,6 @@ public class HttpMessageLocalClient extends HttpMessageClient {
} }
HttpRequest req = new HttpMessageLocalRequest(context(), request, userid); HttpRequest req = new HttpMessageLocalRequest(context(), request, userid);
HttpResponse resp = new HttpMessageLocalResponse(req, null); HttpResponse resp = new HttpMessageLocalResponse(req, null);
Traces.computeCurrTraceid(request.getTraceid());
try { try {
servlet.execute(req, resp); servlet.execute(req, resp);
} catch (Exception e) { } catch (Exception e) {
@@ -162,7 +158,6 @@ public class HttpMessageLocalClient extends HttpMessageClient {
HttpDispatcherServlet ps = dispatcherServlet(); HttpDispatcherServlet ps = dispatcherServlet();
HttpRequest req = new HttpMessageLocalRequest(context(), request, userid); HttpRequest req = new HttpMessageLocalRequest(context(), request, userid);
HttpResponse resp = new HttpMessageLocalResponse(req, null); HttpResponse resp = new HttpMessageLocalResponse(req, null);
Traces.computeCurrTraceid(request.getTraceid());
ps.filterServletsByMmcTopic(topic).forEach(s -> { ps.filterServletsByMmcTopic(topic).forEach(s -> {
try { try {
s.execute(req, resp); s.execute(req, resp);

4
src/main/java/org/redkale/util/ResourceFactory.java
View File

@@ -38,6 +38,8 @@ public final class ResourceFactory {
public static final String RESOURCE_PARENT_NAME = "$"; public static final String RESOURCE_PARENT_NAME = "$";
private static final boolean skipCheckRequired = Boolean.getBoolean("redkale.resource.skip.check");
private static final Logger logger = Logger.getLogger(ResourceFactory.class.getSimpleName()); private static final Logger logger = Logger.getLogger(ResourceFactory.class.getSimpleName());
private final ResourceFactory parent; private final ResourceFactory parent;
@@ -828,7 +830,7 @@ public final class ResourceFactory {
} }
} }
if (rs != null) field.set(srcObj, rs); if (rs != null) field.set(srcObj, rs);
if (rs == null && rc.required()) { if (rs == null && !skipCheckRequired && rc.required()) {
throw new ResourceInjectException("resource(type=" + field.getType().getSimpleName() + ".class, field=" + field.getName() + ", name='" + rcname + "') must exists in " + srcObj.getClass().getName()); throw new ResourceInjectException("resource(type=" + field.getType().getSimpleName() + ".class, field=" + field.getName() + ", name='" + rcname + "') must exists in " + srcObj.getClass().getName());
} }
} }

3
src/main/java/org/redkale/util/Traces.java
View File

@@ -16,7 +16,7 @@ import java.util.function.Supplier;
*/ */
public class Traces { public class Traces {
private static final boolean enable = !Boolean.getBoolean("redkale.trace.enable"); private static final boolean enable = Boolean.getBoolean("redkale.trace.enable");
private static final ThreadLocal<String> localTrace = new ThreadLocal<>(); private static final ThreadLocal<String> localTrace = new ThreadLocal<>();
@@ -49,6 +49,7 @@ public class Traces {
// } // }
// return traceid; // return traceid;
// } // }
public static void currTraceid(String traceid) { public static void currTraceid(String traceid) {
if (enable) { if (enable) {
localTrace.set(traceid); localTrace.set(traceid);