Browse Source

Remove TODOs related to profile logging

Issue: SPR-8031, SPR-7508, SPR-8057
pull/7/head
Chris Beams 14 years ago
parent
commit
150838bfc1
  1. 3
      org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
  2. 1
      org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java
  3. 1
      org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
  4. 3
      org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
  5. 1
      org.springframework.core/src/main/java/org/springframework/core/env/MutablePropertySources.java

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

@ -1,5 +1,5 @@ @@ -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");
* you may not use this file except in compliance with the License.
@ -123,7 +123,6 @@ public class DefaultBeanDefinitionDocumentReader implements BeanDefinitionDocume @@ -123,7 +123,6 @@ public class DefaultBeanDefinitionDocumentReader implements BeanDefinitionDocume
Assert.state(this.environment != null, "environment property must not be null");
String[] specifiedProfiles = StringUtils.tokenizeToStringArray(profileSpec, BeanDefinitionParserDelegate.MULTI_VALUE_ATTRIBUTE_DELIMITERS);
if (!this.environment.acceptsProfiles(specifiedProfiles)) {
// TODO SPR-7508: log that this bean is being rejected on profile mismatch
return;
}
}

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

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

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

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

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

@ -1,5 +1,5 @@ @@ -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");
* you may not use this file except in compliance with the License.
@ -104,7 +104,6 @@ class ConfigurationClassParser { @@ -104,7 +104,6 @@ class ConfigurationClassParser {
AnnotationMetadata metadata = configClass.getMetadata();
if (this.environment != null && ProfileHelper.isProfileAnnotationPresent(metadata)) {
if (!this.environment.acceptsProfiles(ProfileHelper.getCandidateProfiles(metadata))) {
// TODO SPR-7508: log that this bean is being rejected on profile mismatch
return;
}
}

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

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

Loading…
Cancel
Save