WIP

Author: mhalbritter

core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationExcludeFilter.java

@@ -27,7 +27,6 @@
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.filter.TypeFilter;
-import org.springframework.util.Assert;
 
 /**
  * A {@link TypeFilter} implementation that matches registered auto-configuration classes.
@@ -66,12 +65,13 @@ private boolean isAutoConfiguration(MetadataReader metadataReader) {
 	}
 
 	protected List<String> getAutoConfigurations() {
-		if (this.autoConfigurations == null) {
+		List<String> autoConfigurations = this.autoConfigurations;
+		if (autoConfigurations == null) {
 			ImportCandidates importCandidates = ImportCandidates.load(AutoConfiguration.class, this.beanClassLoader);
-			this.autoConfigurations = importCandidates.getCandidates();
+			autoConfigurations = importCandidates.getCandidates();
+			this.autoConfigurations = autoConfigurations;
 		}
-		Assert.state(this.autoConfigurations != null, "'autoConfigurations' must not be null");
-		return this.autoConfigurations;
+		return autoConfigurations;
 	}
 
 }

core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java

@@ -202,17 +202,21 @@ boolean isAvailable() {
 		}
 
 		Set<String> getBefore() {
-			if (this.before == null) {
-				this.before = getClassNames("AutoConfigureBefore", AutoConfigureBefore.class);
+			Set<String> before = this.before;
+			if (before == null) {
+				before = getClassNames("AutoConfigureBefore", AutoConfigureBefore.class);
+				this.before = before;
 			}
-			return this.before;
+			return before;
 		}
 
 		Set<String> getAfter() {
-			if (this.after == null) {
-				this.after = getClassNames("AutoConfigureAfter", AutoConfigureAfter.class);
+			Set<String> after = this.after;
+			if (after == null) {
+				after = getClassNames("AutoConfigureAfter", AutoConfigureAfter.class);
+				this.after = after;
 			}
-			return this.after;
+			return after;
 		}
 
 		private Set<String> getClassNames(String metadataKey, Class<? extends Annotation> annotation) {
@@ -244,7 +248,12 @@ private int getOrder() {
 			}
 			Map<String, @Nullable Object> attributes = getAnnotationMetadata()
 				.getAnnotationAttributes(AutoConfigureOrder.class.getName());
-			return (attributes != null) ? (Integer) attributes.get("value") : AutoConfigureOrder.DEFAULT_ORDER;
+			if (attributes != null) {
+				Integer value = (Integer) attributes.get("value");
+				Assert.state(value != null, "'value' must not be null");
+				return value;
+			}
+			return AutoConfigureOrder.DEFAULT_ORDER;
 		}
 
 		private boolean wasProcessed() {
@@ -258,23 +267,29 @@ private Set<String> getAnnotationValue(Class<?> annotation) {
 			if (attributes == null) {
 				return Collections.emptySet();
 			}
-			Set<String> value = new LinkedHashSet<>();
-			Collections.addAll(value, (String[]) attributes.get("value"));
-			Collections.addAll(value, (String[]) attributes.get("name"));
-			return value;
+			Set<String> result = new LinkedHashSet<>();
+			String[] value = (String[]) attributes.get("value");
+			String[] name = (String[]) attributes.get("name");
+			Assert.state(value != null, "'value' must not be null");
+			Assert.state(name != null, "'name' must not be null");
+			Collections.addAll(result, value);
+			Collections.addAll(result, name);
+			return result;
 		}
 
 		private AnnotationMetadata getAnnotationMetadata() {
-			if (this.annotationMetadata == null) {
+			AnnotationMetadata annotationMetadata = this.annotationMetadata;
+			if (annotationMetadata == null) {
 				try {
 					MetadataReader metadataReader = this.metadataReaderFactory.getMetadataReader(this.className);
-					this.annotationMetadata = metadataReader.getAnnotationMetadata();
+					annotationMetadata = metadataReader.getAnnotationMetadata();
+					this.annotationMetadata = annotationMetadata;
 				}
 				catch (IOException ex) {
 					throw new IllegalStateException("Unable to read meta-data for class " + this.className, ex);
 				}
 			}
-			return this.annotationMetadata;
+			return annotationMetadata;
 		}
 
 	}

core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/FilteringSpringBootCondition.java

@@ -55,13 +55,14 @@ public boolean[] match(@Nullable String[] autoConfigurationClasses,
 		@Nullable ConditionOutcome[] outcomes = getOutcomes(autoConfigurationClasses, autoConfigurationMetadata);
 		boolean[] match = new boolean[outcomes.length];
 		for (int i = 0; i < outcomes.length; i++) {
-			match[i] = (outcomes[i] == null || outcomes[i].isMatch());
-			if (!match[i] && outcomes[i] != null) {
+			ConditionOutcome outcome = outcomes[i];
+			match[i] = (outcome == null || outcome.isMatch());
+			if (!match[i] && outcome != null) {
 				String autoConfigurationClass = autoConfigurationClasses[i];
 				Assert.state(autoConfigurationClass != null, "'autoConfigurationClass' must not be null");
-				logOutcome(autoConfigurationClass, outcomes[i]);
+				logOutcome(autoConfigurationClass, outcome);
 				if (report != null) {
-					report.recordConditionEvaluation(autoConfigurationClass, this, outcomes[i]);
+					report.recordConditionEvaluation(autoConfigurationClass, this, outcome);
 				}
 			}
 		}