From 5a697409decfe8423c2060bfe093e33c91be05f8 Mon Sep 17 00:00:00 2001 From: fredrikliu <fredrikliu@tencent.com> Date: Tue, 18 Jun 2024 10:06:16 +0800 Subject: [PATCH] fix:change modify format --- .../spring-cloud-2022-plugin/pom.xml | 4 -- .../ConfigurationParserInterceptor.java | 28 +--------- .../ConfigurationParserInterceptor.java | 55 ++++++++++--------- 3 files changed, 29 insertions(+), 58 deletions(-) diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/pom.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/pom.xml index 44df79e4..61369dba 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/pom.xml +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/pom.xml @@ -409,10 +409,6 @@ <groupId>com.tencent.cloud</groupId> <artifactId>spring-cloud-tencent-lossless-plugin</artifactId> </dependency> - <dependency> - <groupId>com.tencent.cloud</groupId> - <artifactId>spring-cloud-starter-tencent-polaris-discovery</artifactId> - </dependency> </dependencies> diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/ConfigurationParserInterceptor.java b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/ConfigurationParserInterceptor.java index ed4d6263..55d0df6e 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/ConfigurationParserInterceptor.java +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/ConfigurationParserInterceptor.java @@ -121,39 +121,13 @@ public void after(Object target, Object[] args, Object result, Throwable throwab BeanDefinitionRegistry registry = (BeanDefinitionRegistry) ReflectionUtils.getObjectByFieldName(target, "registry"); Environment environment = (Environment) ReflectionUtils.getObjectByFieldName(target, "environment"); for (BeanInjector beanInjector : beanInjectors) { -// if (!(beanInjector instanceof RouterBeanInjector)) { -// LOGGER.info("[PolarisJavaAgent] start to inject application bean definitions in module {}", beanInjector.getModule()); -// beanInjector.onApplicationStartup(target, constructor, processConfigurationClass, registry, environment); -// } beanInjector.onApplicationStartup(target, constructor, processConfigurationClass, registry, environment); } LOGGER.info("[PolarisJavaAgent] successfully injected spring cloud tencent application bean definitions"); } } - -// @Override -// public void before(Object target, Object[] args) { -// Set<?> candidates = (Set<?>) args[0]; -// BeanDefinitionHolder beanDefinitionHolder = (BeanDefinitionHolder) candidates.iterator().next(); -// if (isMainBeanDefinition(beanDefinitionHolder)) { -// Class<?> clazz = ClassUtils.getClazz("org.springframework.context.annotation.ConfigurationClass", null); -// Constructor<?> constructor = ReflectionUtils.accessibleConstructor(clazz, Class.class, String.class); -// Method processConfigurationClass = ReflectionUtils.findMethod(target.getClass(), "processConfigurationClass", clazz, Predicate.class); -// ReflectionUtils.makeAccessible(processConfigurationClass); -// -// BeanDefinitionRegistry registry = (BeanDefinitionRegistry) ReflectionUtils.getObjectByFieldName(target, "registry"); -// Environment environment = (Environment) ReflectionUtils.getObjectByFieldName(target, "environment"); -// for (BeanInjector beanInjector : beanInjectors) { -// if ((beanInjector instanceof RouterBeanInjector)) { -// LOGGER.info("[PolarisJavaAgent] start to inject application bean definitions in module {}", beanInjector.getModule()); -// beanInjector.onApplicationStartup(target, constructor, processConfigurationClass, registry, environment); -// } -// } -// LOGGER.info("[PolarisJavaAgent] successfully injected spring cloud tencent application bean definitions"); -// -// } -// } + } diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/ConfigurationParserInterceptor.java b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/ConfigurationParserInterceptor.java index 5213a6ed..42e5060c 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/ConfigurationParserInterceptor.java +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/ConfigurationParserInterceptor.java @@ -69,7 +69,7 @@ public ConfigurationParserInterceptor() { beanInjectors.add(new RouterBeanInjector()); beanInjectors.add(new LoadbalancerBeanInjector()); beanInjectors.add(new ConfigBeanInjector()); - beanInjectors.add(new LosslessBeanInjector()); +// beanInjectors.add(new LosslessBeanInjector()); } @@ -117,38 +117,39 @@ public void after(Object target, Object[] args, Object result, Throwable throwab BeanDefinitionRegistry registry = (BeanDefinitionRegistry) ReflectionUtils.getObjectByFieldName(target, "registry"); Environment environment = (Environment) ReflectionUtils.getObjectByFieldName(target, "environment"); for (BeanInjector beanInjector : beanInjectors) { - if (!(beanInjector instanceof CommonBeanInjector)) { - LOGGER.info("[PolarisJavaAgent] start to inject application bean definitions in module {}", beanInjector.getModule()); - beanInjector.onApplicationStartup(target, constructor, processConfigurationClass, registry, environment); - } +// if (!(beanInjector instanceof CommonBeanInjector)) { +// LOGGER.info("[PolarisJavaAgent] start to inject application bean definitions in module {}", beanInjector.getModule()); +// beanInjector.onApplicationStartup(target, constructor, processConfigurationClass, registry, environment); +// } + beanInjector.onApplicationStartup(target, constructor, processConfigurationClass, registry, environment); } LOGGER.info("[PolarisJavaAgent] successfully injected spring cloud tencent application bean definitions"); } } - @Override - public void before(Object target, Object[] args) { - Set<?> candidates = (Set<?>) args[0]; - BeanDefinitionHolder beanDefinitionHolder = (BeanDefinitionHolder) candidates.iterator().next(); - if (isMainBeanDefinition(beanDefinitionHolder)) { - Class<?> clazz = ClassUtils.getClazz("org.springframework.context.annotation.ConfigurationClass", null); - Constructor<?> constructor = ReflectionUtils.accessibleConstructor(clazz, Class.class, String.class); - Method processConfigurationClass = ReflectionUtils.findMethod(target.getClass(), "processConfigurationClass", clazz, Predicate.class); - ReflectionUtils.makeAccessible(processConfigurationClass); - - BeanDefinitionRegistry registry = (BeanDefinitionRegistry) ReflectionUtils.getObjectByFieldName(target, "registry"); - Environment environment = (Environment) ReflectionUtils.getObjectByFieldName(target, "environment"); - for (BeanInjector beanInjector : beanInjectors) { - if (beanInjector instanceof CommonBeanInjector) { - LOGGER.info("[PolarisJavaAgent] start to inject application bean definitions in module {}", beanInjector.getModule()); - beanInjector.onApplicationStartup(target, constructor, processConfigurationClass, registry, environment); - } - } - LOGGER.info("[PolarisJavaAgent] successfully injected spring cloud tencent application bean definitions"); - - } - } +// @Override +// public void before(Object target, Object[] args) { +// Set<?> candidates = (Set<?>) args[0]; +// BeanDefinitionHolder beanDefinitionHolder = (BeanDefinitionHolder) candidates.iterator().next(); +// if (isMainBeanDefinition(beanDefinitionHolder)) { +// Class<?> clazz = ClassUtils.getClazz("org.springframework.context.annotation.ConfigurationClass", null); +// Constructor<?> constructor = ReflectionUtils.accessibleConstructor(clazz, Class.class, String.class); +// Method processConfigurationClass = ReflectionUtils.findMethod(target.getClass(), "processConfigurationClass", clazz, Predicate.class); +// ReflectionUtils.makeAccessible(processConfigurationClass); +// +// BeanDefinitionRegistry registry = (BeanDefinitionRegistry) ReflectionUtils.getObjectByFieldName(target, "registry"); +// Environment environment = (Environment) ReflectionUtils.getObjectByFieldName(target, "environment"); +// for (BeanInjector beanInjector : beanInjectors) { +// if (beanInjector instanceof CommonBeanInjector) { +// LOGGER.info("[PolarisJavaAgent] start to inject application bean definitions in module {}", beanInjector.getModule()); +// beanInjector.onApplicationStartup(target, constructor, processConfigurationClass, registry, environment); +// } +// } +// LOGGER.info("[PolarisJavaAgent] successfully injected spring cloud tencent application bean definitions"); +// +// } +// }