root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Remove TODOs related to profile logging 

Issue: SPR-8031, SPR-7508, SPR-8057
This commit is contained in:
Chris Beams 2011-03-15 12:57:43 +00:00
parent b50ac7489b
commit 150838bfc1
5 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2010 the original author or authors. * Copyright 2002-2011 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -123,7 +123,6 @@ public class DefaultBeanDefinitionDocumentReader implements BeanDefinitionDocume
Assert.state(this.environment != null, "environment property must not be null"); Assert.state(this.environment != null, "environment property must not be null");
String[] specifiedProfiles = StringUtils.tokenizeToStringArray(profileSpec, BeanDefinitionParserDelegate.MULTI_VALUE_ATTRIBUTE_DELIMITERS); String[] specifiedProfiles = StringUtils.tokenizeToStringArray(profileSpec, BeanDefinitionParserDelegate.MULTI_VALUE_ATTRIBUTE_DELIMITERS);
if (!this.environment.acceptsProfiles(specifiedProfiles)) { if (!this.environment.acceptsProfiles(specifiedProfiles)) {
// TODO SPR-7508: log that this bean is being rejected on profile mismatch
return; return;
} }
} }

1
org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java
View File

@ -116,7 +116,6 @@ public class AnnotatedBeanDefinitionReader {
if (ProfileHelper.isProfileAnnotationPresent(metadata)) { if (ProfileHelper.isProfileAnnotationPresent(metadata)) {
if (!this.environment.acceptsProfiles(ProfileHelper.getCandidateProfiles(metadata))) { if (!this.environment.acceptsProfiles(ProfileHelper.getCandidateProfiles(metadata))) {
// TODO SPR-7508: log that this bean is being rejected on profile mismatch
return; return;
} }
} }

1
org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
View File

@ -300,7 +300,6 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
if (!ProfileHelper.isProfileAnnotationPresent(metadata)) { if (!ProfileHelper.isProfileAnnotationPresent(metadata)) {
return true; return true;
} }
// TODO SPR-7508: log that this bean is being rejected on profile mismatch
return this.environment.acceptsProfiles(ProfileHelper.getCandidateProfiles(metadata)); return this.environment.acceptsProfiles(ProfileHelper.getCandidateProfiles(metadata));
} }
} }

3
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2010 the original author or authors. * Copyright 2002-2011 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -104,7 +104,6 @@ class ConfigurationClassParser {
AnnotationMetadata metadata = configClass.getMetadata(); AnnotationMetadata metadata = configClass.getMetadata();
if (this.environment != null && ProfileHelper.isProfileAnnotationPresent(metadata)) { if (this.environment != null && ProfileHelper.isProfileAnnotationPresent(metadata)) {
if (!this.environment.acceptsProfiles(ProfileHelper.getCandidateProfiles(metadata))) { if (!this.environment.acceptsProfiles(ProfileHelper.getCandidateProfiles(metadata))) {
// TODO SPR-7508: log that this bean is being rejected on profile mismatch
return; return;
} }
} }

1
org.springframework.core/src/main/java/org/springframework/core/env/MutablePropertySources.java vendored
View File

@ -160,7 +160,6 @@ public class MutablePropertySources implements PropertySources {
*/ */
protected void removeIfPresent(PropertySource<?> propertySource) { protected void removeIfPresent(PropertySource<?> propertySource) {
if (this.propertySourceList.contains(propertySource)) { if (this.propertySourceList.contains(propertySource)) {
// TODO SPR-7508: add logging
this.propertySourceList.remove(propertySource); this.propertySourceList.remove(propertySource);
} }
} }