Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-2988: Use @Config(proxyBeanMethods=false) (#2989)

Browse Source 
* GH-2988: Use `@Config(proxyBeanMethods=false)`

Fixes https://github.com/spring-projects/spring-integration/issues/2988

For faster startup (and possibility to compile to native code with GraalVM)
use a `proxyBeanMethods = false` on all the `@Configuration` classes
in the Framework
* Provide some other code style polishing

* * Fix Checkstyle violation
This commit is contained in:
Artem Bilan
2019-07-22 13:59:23 -04:00
committed by Gary Russell
parent 989d31716d
commit 084aaf7e57
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfiguration.java
View File

@@ -44,7 +44,7 @@ import org.springframework.util.StringUtils;
*
* @since 4.2
*/
@Configuration
@Configuration(proxyBeanMethods = false)
public class IntegrationManagementConfiguration implements ImportAware, EnvironmentAware {
private AnnotationAttributes attributes;
@@ -60,7 +60,7 @@ public class IntegrationManagementConfiguration implements ImportAware, Environm
public void setImportMetadata(AnnotationMetadata importMetadata) {
Map<String, Object> map = importMetadata.getAnnotationAttributes(EnableIntegrationManagement.class.getName());
this.attributes = AnnotationAttributes.fromMap(map);
Assert.notNull(this.attributes,
Assert.notNull(this.attributes, () ->
"@EnableIntegrationManagement is not present on importing class " + importMetadata.getClassName());
}
@@ -85,7 +85,7 @@ public class IntegrationManagementConfiguration implements ImportAware, Environm
}
private void setupCountsEnabledNamePatterns(IntegrationManagementConfigurer configurer) {
List<String> patterns = new ArrayList<String>();
List<String> patterns = new ArrayList<>();
String[] countsEnabled = this.attributes.getStringArray("countsEnabled");
for (String managedComponent : countsEnabled) {
String pattern = this.environment.resolvePlaceholders(managedComponent);

17
spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/IntegrationMBeanExportConfiguration.java
View File

@@ -58,10 +58,13 @@ import org.springframework.util.StringUtils;
*
* @since 4.0
*/
@Configuration
@Configuration(proxyBeanMethods = false)
public class IntegrationMBeanExportConfiguration implements ImportAware, EnvironmentAware, BeanFactoryAware {
private static final String MBEAN_EXPORTER_NAME = "integrationMbeanExporter";
/**
* A name for default {@link IntegrationMBeanExporter} bean.
*/
public static final String MBEAN_EXPORTER_NAME = "integrationMbeanExporter";
private AnnotationAttributes attributes;
@@ -95,7 +98,7 @@ public class IntegrationMBeanExportConfiguration implements ImportAware, Environ
public void setImportMetadata(AnnotationMetadata importMetadata) {
Map<String, Object> map = importMetadata.getAnnotationAttributes(EnableIntegrationMBeanExport.class.getName());
this.attributes = AnnotationAttributes.fromMap(map);
Assert.notNull(this.attributes,
Assert.notNull(this.attributes, () ->
"@EnableIntegrationMBeanExport is not present on importing class " + importMetadata.getClassName());
}
@@ -121,7 +124,7 @@ public class IntegrationMBeanExportConfiguration implements ImportAware, Environ
private void setupDomain(IntegrationMBeanExporter exporter) {
String defaultDomain = this.attributes.getString("defaultDomain");
if (defaultDomain != null && this.environment != null) {
if (this.environment != null) {
defaultDomain = this.environment.resolvePlaceholders(defaultDomain);
}
if (StringUtils.hasText(defaultDomain)) {
@@ -131,11 +134,11 @@ public class IntegrationMBeanExportConfiguration implements ImportAware, Environ
private void setupServer(IntegrationMBeanExporter exporter) {
String server = this.attributes.getString("server");
if (server != null && this.environment != null) {
if (this.environment != null) {
server = this.environment.resolvePlaceholders(server);
}
if (StringUtils.hasText(server)) {
MBeanServer bean = null;
MBeanServer bean;
if (server.startsWith("#{") && server.endsWith("}")) {
bean = (MBeanServer) this.resolver.evaluate(server, this.expressionContext);
}
@@ -159,7 +162,7 @@ public class IntegrationMBeanExportConfiguration implements ImportAware, Environ
String pattern = this.environment.resolvePlaceholders(managedComponent);
patterns.addAll(Arrays.asList(StringUtils.commaDelimitedListToStringArray(pattern)));
}
exporter.setComponentNamePatterns(patterns.toArray(new String[patterns.size()]));
exporter.setComponentNamePatterns(patterns.toArray(new String[0]));
}
}