From 9caf82ce805f615b4e53ba36d3ec2b935d1f780d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 4 May 2017 16:30:01 +0100 Subject: [PATCH] Remove redundant ordering from ImportBeanDefinitionRegistrar implementations Closes gh-8603 --- .../boot/autoconfigure/AutoConfigurationPackages.java | 3 --- .../autoconfigure/TestAutoConfigurationPackageRegistrar.java | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java index 08215a74dd9..ed769ee4ed3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java @@ -34,8 +34,6 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.boot.context.annotation.DeterminableImports; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; -import org.springframework.core.Ordered; -import org.springframework.core.annotation.Order; import org.springframework.core.type.AnnotationMetadata; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; @@ -123,7 +121,6 @@ public abstract class AutoConfigurationPackages { * {@link ImportBeanDefinitionRegistrar} to store the base package from the importing * configuration. */ - @Order(Ordered.HIGHEST_PRECEDENCE) static class Registrar implements ImportBeanDefinitionRegistrar, DeterminableImports { @Override diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/TestAutoConfigurationPackageRegistrar.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/TestAutoConfigurationPackageRegistrar.java index 4c34a3a7d6a..9f0d8e8df0f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/TestAutoConfigurationPackageRegistrar.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/TestAutoConfigurationPackageRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2017 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. @@ -18,9 +18,7 @@ package org.springframework.boot.autoconfigure; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; -import org.springframework.core.Ordered; import org.springframework.core.annotation.AnnotationAttributes; -import org.springframework.core.annotation.Order; import org.springframework.core.type.AnnotationMetadata; import org.springframework.util.ClassUtils; @@ -29,7 +27,6 @@ import org.springframework.util.ClassUtils; * * @author Phillip Webb */ -@Order(Ordered.HIGHEST_PRECEDENCE) public class TestAutoConfigurationPackageRegistrar implements ImportBeanDefinitionRegistrar {