未验证 提交 47d5a768 编写于 作者: D Daming 提交者: GitHub

chore: fix UnnecessaryParentheses (#5624)

上级 0171ff6a
......@@ -75,9 +75,7 @@ public class AdapterActionFutureActionGetMethodsInterceptor implements InstanceM
}
private boolean isTrace(EnhancedInstance objInst) {
return objInst.getSkyWalkingDynamicField() != null && (boolean) objInst.getSkyWalkingDynamicField();
}
private void parseResponseInfo(ActionResponse response, AbstractSpan span) {
......
......@@ -36,7 +36,7 @@ public class ClusterClientGetSettingsMethodsInterceptor implements InstanceMetho
public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments,
Class<?>[] argumentsTypes, MethodInterceptResult result) throws Throwable {
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
if (restClientEnhanceInfo != null) {
AbstractSpan span = ContextManager
.createExitSpan(Constants.CLUSTER_GET_SETTINGS_NAME, restClientEnhanceInfo.getPeers());
......@@ -50,7 +50,7 @@ public class ClusterClientGetSettingsMethodsInterceptor implements InstanceMetho
@Override
public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments,
Class<?>[] argumentsTypes, Object ret) throws Throwable {
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
if (restClientEnhanceInfo != null) {
ContextManager.stopSpan();
}
......@@ -60,7 +60,7 @@ public class ClusterClientGetSettingsMethodsInterceptor implements InstanceMetho
@Override
public void handleMethodException(EnhancedInstance objInst, Method method,
Object[] allArguments, Class<?>[] argumentsTypes, Throwable t) {
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
if (restClientEnhanceInfo != null) {
ContextManager.activeSpan().log(t);
}
......
......@@ -36,7 +36,7 @@ public class ClusterClientHealthMethodsInterceptor implements InstanceMethodsAro
public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments,
Class<?>[] argumentsTypes, MethodInterceptResult result) throws Throwable {
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
if (restClientEnhanceInfo != null) {
AbstractSpan span = ContextManager.createExitSpan(Constants.CLUSTER_HEALTH_NAME, restClientEnhanceInfo.getPeers());
span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT);
......
......@@ -38,9 +38,9 @@ public class ClusterClientPutSettingsMethodsInterceptor implements InstanceMetho
@Override
public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments,
Class<?>[] argumentsTypes, MethodInterceptResult result) throws Throwable {
ClusterUpdateSettingsRequest updateSettingsRequest = (ClusterUpdateSettingsRequest) (allArguments[0]);
ClusterUpdateSettingsRequest updateSettingsRequest = (ClusterUpdateSettingsRequest) allArguments[0];
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
if (restClientEnhanceInfo != null) {
AbstractSpan span = ContextManager
.createExitSpan(Constants.CLUSTER_PUT_SETTINGS_NAME, restClientEnhanceInfo.getPeers());
......@@ -68,7 +68,7 @@ public class ClusterClientPutSettingsMethodsInterceptor implements InstanceMetho
@Override
public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments,
Class<?>[] argumentsTypes, Object ret) throws Throwable {
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
if (restClientEnhanceInfo != null) {
ContextManager.stopSpan();
}
......@@ -78,7 +78,7 @@ public class ClusterClientPutSettingsMethodsInterceptor implements InstanceMetho
@Override
public void handleMethodException(EnhancedInstance objInst, Method method,
Object[] allArguments, Class<?>[] argumentsTypes, Throwable t) {
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
if (restClientEnhanceInfo != null) {
ContextManager.activeSpan().log(t);
}
......
......@@ -40,7 +40,7 @@ public class IndicesClientCreateMethodsInterceptor implements InstanceMethodsAro
MethodInterceptResult result) throws Throwable {
CreateIndexRequest createIndexRequest = (CreateIndexRequest) (allArguments[0]);
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
if (restClientEnhanceInfo != null) {
AbstractSpan span = ContextManager.createExitSpan(Constants.CREATE_OPERATOR_NAME, restClientEnhanceInfo.getPeers());
span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT);
......
......@@ -38,9 +38,9 @@ public class IndicesClientDeleteMethodsInterceptor implements InstanceMethodsAro
@Override
public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
MethodInterceptResult result) throws Throwable {
DeleteIndexRequest deleteIndexRequest = (DeleteIndexRequest) (allArguments[0]);
DeleteIndexRequest deleteIndexRequest = (DeleteIndexRequest) allArguments[0];
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
if (restClientEnhanceInfo != null) {
AbstractSpan span = ContextManager.createExitSpan(Constants.DELETE_OPERATOR_NAME, restClientEnhanceInfo.getPeers());
span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT);
......@@ -54,7 +54,7 @@ public class IndicesClientDeleteMethodsInterceptor implements InstanceMethodsAro
@Override
public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
Object ret) throws Throwable {
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
if (restClientEnhanceInfo != null) {
ContextManager.stopSpan();
}
......@@ -64,7 +64,7 @@ public class IndicesClientDeleteMethodsInterceptor implements InstanceMethodsAro
@Override
public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments,
Class<?>[] argumentsTypes, Throwable t) {
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
if (restClientEnhanceInfo != null) {
ContextManager.activeSpan().log(t);
}
......
......@@ -29,7 +29,7 @@ import org.elasticsearch.client.RestClientBuilder;
public class RestHighLevelClientConInterceptor implements InstanceConstructorInterceptor {
@Override
public void onConstruct(EnhancedInstance objInst, Object[] allArguments) {
RestClientBuilder restClientBuilder = (RestClientBuilder) (allArguments[0]);
RestClientBuilder restClientBuilder = (RestClientBuilder) allArguments[0];
RestClient restClient = restClientBuilder.build();
RestClientEnhanceInfo restClientEnhanceInfo = new RestClientEnhanceInfo();
......
......@@ -40,7 +40,7 @@ public class RestHighLevelClientGetMethodsInterceptor implements InstanceMethods
MethodInterceptResult result) throws Throwable {
GetRequest getRequest = (GetRequest) (allArguments[0]);
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
AbstractSpan span = ContextManager.createExitSpan(Constants.GET_OPERATOR_NAME, restClientEnhanceInfo.getPeers());
span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT);
......
......@@ -40,7 +40,7 @@ public class RestHighLevelClientIndexMethodsInterceptor implements InstanceMetho
MethodInterceptResult result) throws Throwable {
IndexRequest indexRequest = (IndexRequest) (allArguments[0]);
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
AbstractSpan span = ContextManager.createExitSpan(Constants.INDEX_OPERATOR_NAME, restClientEnhanceInfo.getPeers());
span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT);
......
......@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
import org.apache.skywalking.apm.plugin.elasticsearch.v6.RestClientEnhanceInfo;
public class RestHighLevelClientIndicesMethodsInterceptor implements InstanceMethodsAroundInterceptor {
......@@ -36,7 +35,7 @@ public class RestHighLevelClientIndicesMethodsInterceptor implements InstanceMet
public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
Object ret) throws Throwable {
if (ret instanceof EnhancedInstance) {
((EnhancedInstance) ret).setSkyWalkingDynamicField((RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField()));
((EnhancedInstance) ret).setSkyWalkingDynamicField(objInst.getSkyWalkingDynamicField());
}
return ret;
}
......
......@@ -41,7 +41,7 @@ public class RestHighLevelClientSearchMethodsInterceptor implements InstanceMeth
MethodInterceptResult result) throws Throwable {
SearchRequest searchRequest = (SearchRequest) (allArguments[0]);
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
AbstractSpan span = ContextManager.createExitSpan(Constants.SEARCH_OPERATOR_NAME, restClientEnhanceInfo.getPeers());
span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT);
......
......@@ -40,7 +40,7 @@ public class RestHighLevelClientUpdateMethodsInterceptor implements InstanceMeth
MethodInterceptResult result) throws Throwable {
UpdateRequest updateRequest = (UpdateRequest) (allArguments[0]);
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField());
RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField();
AbstractSpan span = ContextManager.createExitSpan(Constants.UPDATE_OPERATOR_NAME, restClientEnhanceInfo.getPeers());
span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT);
......
......@@ -87,8 +87,9 @@ public class Play2xInstrumentation extends ClassInstanceMethodsEnhancePluginDefi
public static ElementMatcher<MethodDescription> getFiltersMethodMatcher() {
String scala212Seq = "scala.collection.Seq";
String scala213Seq = "scala.collection.immutable.Seq";
return (named(ENHANCE_METHOD).and(ReturnTypeNameMatch.returnsWithType(scala212Seq))).or(named(ENHANCE_METHOD).and(ReturnTypeNameMatch
.returnsWithType(scala213Seq)));
return named(ENHANCE_METHOD)
.and(ReturnTypeNameMatch.returnsWithType(scala212Seq))
.or(named(ENHANCE_METHOD).and(ReturnTypeNameMatch.returnsWithType(scala213Seq)));
}
}
......@@ -68,10 +68,15 @@ public class RoutingHandlerInstrumentation extends ClassInstanceMethodsEnhancePl
}
public static ElementMatcher<MethodDescription> getRoutingHandlerMethodMatcher() {
final ElementMatcher.Junction<MethodDescription> basicMatcher = named(ENHANCE_METHOD).and(takesArgumentWithType(0, "io.undertow.util.HttpString"))
.and(takesArgumentWithType(1, "java.lang.String"));
final ElementMatcher.Junction<MethodDescription> basicMatcher = named(ENHANCE_METHOD).and(
takesArgumentWithType(0, "io.undertow.util.HttpString"))
.and(takesArgumentWithType(
1,
"java.lang.String"
));
final String httpHandlerClassName = "io.undertow.server.HttpHandler";
return (basicMatcher.and(takesArgumentWithType(2, httpHandlerClassName))).or(basicMatcher.and(takesArgumentWithType(3, httpHandlerClassName)));
return basicMatcher.and(takesArgumentWithType(2, httpHandlerClassName))
.or(basicMatcher.and(takesArgumentWithType(3, httpHandlerClassName)));
}
}
......@@ -65,8 +65,10 @@ public class CallableOrRunnableActivation extends ClassInstanceMethodsEnhancePlu
new InstanceMethodsInterceptPoint() {
@Override
public ElementMatcher<MethodDescription> getMethodsMatcher() {
return (named(CALL_METHOD_NAME).and(takesArguments(0))).or(named(RUN_METHOD_NAME).and(takesArguments(0)))
.or(named(GET_METHOD_NAME).and(takesArguments(0)));
return named(CALL_METHOD_NAME)
.and(takesArguments(0))
.or(named(RUN_METHOD_NAME).and(takesArguments(0)))
.or(named(GET_METHOD_NAME).and(takesArguments(0)));
}
@Override
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册