Skip to content

Commit 9568777

Browse files
committed
Fix devtools package tangle
Fix package tangle in devtools by relocating `DevToolsEnablementDeducer` to a new `system` package. Closes gh-18393
1 parent 062163b commit 9568777

File tree

6 files changed

+25
-5
lines changed

6 files changed

+25
-5
lines changed

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/OnEnabledDevToolsCondition.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.springframework.boot.autoconfigure.condition.ConditionMessage;
2020
import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
2121
import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
22-
import org.springframework.boot.devtools.DevToolsEnablementDeducer;
22+
import org.springframework.boot.devtools.system.DevToolsEnablementDeducer;
2323
import org.springframework.context.annotation.ConditionContext;
2424
import org.springframework.core.type.AnnotatedTypeMetadata;
2525

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.function.Function;
2525

2626
import org.springframework.boot.SpringApplication;
27-
import org.springframework.boot.devtools.DevToolsEnablementDeducer;
27+
import org.springframework.boot.devtools.system.DevToolsEnablementDeducer;
2828
import org.springframework.boot.env.EnvironmentPostProcessor;
2929
import org.springframework.core.env.ConfigurableEnvironment;
3030
import org.springframework.core.env.PropertiesPropertySource;

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsPropertyDefaultsPostProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import org.apache.commons.logging.Log;
2424

2525
import org.springframework.boot.SpringApplication;
26-
import org.springframework.boot.devtools.DevToolsEnablementDeducer;
2726
import org.springframework.boot.devtools.logger.DevToolsLogFactory;
2827
import org.springframework.boot.devtools.restart.Restarter;
28+
import org.springframework.boot.devtools.system.DevToolsEnablementDeducer;
2929
import org.springframework.boot.env.EnvironmentPostProcessor;
3030
import org.springframework.core.Ordered;
3131
import org.springframework.core.annotation.Order;

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/DefaultRestartInitializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import java.net.URL;
2020

21-
import org.springframework.boot.devtools.DevToolsEnablementDeducer;
21+
import org.springframework.boot.devtools.system.DevToolsEnablementDeducer;
2222

2323
/**
2424
* Default {@link RestartInitializer} that only enable initial restart when running a
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.devtools;
17+
package org.springframework.boot.devtools.system;
1818

1919
import java.util.Collections;
2020
import java.util.LinkedHashSet;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Copyright 2012-2019 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
/**
18+
* Devtools system support classes.
19+
*/
20+
package org.springframework.boot.devtools.system;

0 commit comments

Comments
 (0)