diff --git a/spring-boot-admin-docs/src/site/asciidoc/_server-clustering.adoc b/spring-boot-admin-docs/src/site/asciidoc/_server-clustering.adoc index 58afcfab885..4e53a680f7f 100644 --- a/spring-boot-admin-docs/src/site/asciidoc/_server-clustering.adoc +++ b/spring-boot-admin-docs/src/site/asciidoc/_server-clustering.adoc @@ -16,7 +16,7 @@ include::{samples-dir}/spring-boot-admin-sample-hazelcast/pom.xml[tags=dependenc + [source,java,indent=0] ---- -include::{samples-dir}/spring-boot-admin-sample-hazelcast/src/main/java/de/codecentric/boot/admin/SpringBootAdminHazelcastApplication.java[tags=application-hazelcast] +include::{samples-dir}/spring-boot-admin-sample-hazelcast/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminHazelcastApplication.java[tags=application-hazelcast] ---- .Hazelcast configuration options diff --git a/spring-boot-admin-docs/src/site/asciidoc/customize_http-headers.adoc b/spring-boot-admin-docs/src/site/asciidoc/customize_http-headers.adoc index e97a822b3f9..9ad16f49033 100644 --- a/spring-boot-admin-docs/src/site/asciidoc/customize_http-headers.adoc +++ b/spring-boot-admin-docs/src/site/asciidoc/customize_http-headers.adoc @@ -5,5 +5,5 @@ In case you need to inject custom HTTP headers into the requests made to the mon [source,java,indent=0] ---- -include::{samples-dir}/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SpringBootAdminServletApplication.java[tags=customization-http-headers-providers] +include::{samples-dir}/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminServletApplication.java[tags=customization-http-headers-providers] ---- diff --git a/spring-boot-admin-docs/src/site/asciidoc/customize_interceptors.adoc b/spring-boot-admin-docs/src/site/asciidoc/customize_interceptors.adoc index 16c17895dc8..0d1fdf104e7 100644 --- a/spring-boot-admin-docs/src/site/asciidoc/customize_interceptors.adoc +++ b/spring-boot-admin-docs/src/site/asciidoc/customize_interceptors.adoc @@ -6,5 +6,5 @@ This can be useful for auditing or adding some extra security checks. [source,java,indent=0] ---- -include::{samples-dir}/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SpringBootAdminServletApplication.java[tags=customization-instance-exchange-filter-function] +include::{samples-dir}/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminServletApplication.java[tags=customization-instance-exchange-filter-function] ---- diff --git a/spring-boot-admin-docs/src/site/asciidoc/customize_notifiers.adoc b/spring-boot-admin-docs/src/site/asciidoc/customize_notifiers.adoc index 601ca2f2f9a..7fcf2b08648 100644 --- a/spring-boot-admin-docs/src/site/asciidoc/customize_notifiers.adoc +++ b/spring-boot-admin-docs/src/site/asciidoc/customize_notifiers.adoc @@ -6,5 +6,5 @@ You can add your own Notifiers by adding Spring Beans which implement the `Notif [source,java,indent=0] ---- -include::{samples-dir}/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/CustomNotifier.java[tags=customization-notifiers] +include::{samples-dir}/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/CustomNotifier.java[tags=customization-notifiers] ---- diff --git a/spring-boot-admin-docs/src/site/asciidoc/getting-started.adoc b/spring-boot-admin-docs/src/site/asciidoc/getting-started.adoc index b92e6bc060f..f0be06cbe94 100644 --- a/spring-boot-admin-docs/src/site/asciidoc/getting-started.adoc +++ b/spring-boot-admin-docs/src/site/asciidoc/getting-started.adoc @@ -32,8 +32,7 @@ Since Spring Boot Admin relies on Spring Boot, you have to set up a Spring Boot + [source,java] ---- -@Configuration -@EnableAutoConfiguration +@SpringBootApplication @EnableAdminServer public class SpringBootAdminApplication { public static void main(String[] args) { diff --git a/spring-boot-admin-docs/src/site/asciidoc/security.adoc b/spring-boot-admin-docs/src/site/asciidoc/security.adoc index b89cd402531..45028dcacec 100644 --- a/spring-boot-admin-docs/src/site/asciidoc/security.adoc +++ b/spring-boot-admin-docs/src/site/asciidoc/security.adoc @@ -9,7 +9,7 @@ By default `spring-boot-admin-server-ui` provides a login page and a logout butt A Spring Security configuration for your server could look like this: [source,java,indent=0] ---- -include::{samples-dir}/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SecuritySecureConfig.java[tags=configuration-spring-security] +include::{samples-dir}/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/SecuritySecureConfig.java[tags=configuration-spring-security] ---- <1> Grants public access to all static assets and the login page. <2> Every other request must be authenticated. diff --git a/spring-boot-admin-docs/src/site/asciidoc/server-notifications.adoc b/spring-boot-admin-docs/src/site/asciidoc/server-notifications.adoc index 1d040d4f2f3..582f572adf1 100644 --- a/spring-boot-admin-docs/src/site/asciidoc/server-notifications.adoc +++ b/spring-boot-admin-docs/src/site/asciidoc/server-notifications.adoc @@ -500,7 +500,7 @@ A `FilteringNotifier` might be useful, for instance, if you don't want to receiv .How to configure filtering [source,java,indent=0] ---- -include::{samples-dir}/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/NotifierConfig.java[tags=configuration-filtering-notifier] +include::{samples-dir}/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/NotifierConfig.java[tags=configuration-filtering-notifier] ---- <1> Add the `FilteringNotifier` bean using a delegate (e.g. `MailNotifier` when configured) <2> Add the `RemindingNotifier` as primary bean using the `FilteringNotifier` as delegate. diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-consul/docker-compose.yml b/spring-boot-admin-samples/spring-boot-admin-sample-consul/docker-compose.yml index 9a4dc802684..4963881189f 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-consul/docker-compose.yml +++ b/spring-boot-admin-samples/spring-boot-admin-sample-consul/docker-compose.yml @@ -1,5 +1,5 @@ services: consul: - image: library/consul + image: hashicorp/consul ports: - "8500:8500" diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-consul/pom.xml b/spring-boot-admin-samples/spring-boot-admin-sample-consul/pom.xml index ea7a8e1cf14..0be1af5dcf6 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-consul/pom.xml +++ b/spring-boot-admin-samples/spring-boot-admin-sample-consul/pom.xml @@ -65,7 +65,7 @@ - de.codecentric.boot.admin.SpringBootAdminConsulApplication + de.codecentric.boot.admin.sample.SpringBootAdminConsulApplication false diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/java/de/codecentric/boot/admin/SpringBootAdminConsulApplication.java b/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminConsulApplication.java similarity index 96% rename from spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/java/de/codecentric/boot/admin/SpringBootAdminConsulApplication.java rename to spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminConsulApplication.java index 8087e167e30..4d90c27a347 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/java/de/codecentric/boot/admin/SpringBootAdminConsulApplication.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminConsulApplication.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -33,8 +33,7 @@ import de.codecentric.boot.admin.server.config.AdminServerProperties; import de.codecentric.boot.admin.server.config.EnableAdminServer; -@Configuration(proxyBeanMethods = false) -@EnableAutoConfiguration +@SpringBootApplication @EnableDiscoveryClient @EnableAdminServer public class SpringBootAdminConsulApplication { diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/test/java/de/codecentric/boot/admin/SpringBootAdminConsulApplicationTest.java b/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminConsulApplicationTest.java similarity index 96% rename from spring-boot-admin-samples/spring-boot-admin-sample-consul/src/test/java/de/codecentric/boot/admin/SpringBootAdminConsulApplicationTest.java rename to spring-boot-admin-samples/spring-boot-admin-sample-consul/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminConsulApplicationTest.java index 68170721d38..5d529dc7ca3 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/test/java/de/codecentric/boot/admin/SpringBootAdminConsulApplicationTest.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminConsulApplicationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/pom.xml b/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/pom.xml index 8a814cf5212..cfa1f9fa7e8 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/pom.xml +++ b/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/pom.xml @@ -72,7 +72,7 @@ - de.codecentric.boot.admin.SpringBootAdminHazelcastApplication + de.codecentric.boot.admin.sample.SpringBootAdminHazelcastApplication false diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/java/de/codecentric/boot/admin/SpringBootAdminHazelcastApplication.java b/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminHazelcastApplication.java similarity index 97% rename from spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/java/de/codecentric/boot/admin/SpringBootAdminHazelcastApplication.java rename to spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminHazelcastApplication.java index 7e28a84d505..de106ac2ef2 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/java/de/codecentric/boot/admin/SpringBootAdminHazelcastApplication.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminHazelcastApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import com.hazelcast.config.Config; import com.hazelcast.config.EvictionConfig; @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; @@ -49,8 +49,7 @@ import static de.codecentric.boot.admin.server.config.AdminServerHazelcastAutoConfiguration.DEFAULT_NAME_SENT_NOTIFICATIONS_MAP; import static java.util.Collections.singletonList; -@Configuration(proxyBeanMethods = false) -@EnableAutoConfiguration +@SpringBootApplication @EnableAdminServer public class SpringBootAdminHazelcastApplication { diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/test/java/de/codecentric/boot/admin/SpringBootAdminHazelcastApplicationTest.java b/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminHazelcastApplicationTest.java similarity index 96% rename from spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/test/java/de/codecentric/boot/admin/SpringBootAdminHazelcastApplicationTest.java rename to spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminHazelcastApplicationTest.java index 5cf6d249046..9d8c08ef341 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/test/java/de/codecentric/boot/admin/SpringBootAdminHazelcastApplicationTest.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminHazelcastApplicationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-reactive/pom.xml b/spring-boot-admin-samples/spring-boot-admin-sample-reactive/pom.xml index 2c41a0645df..68d12786c46 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-reactive/pom.xml +++ b/spring-boot-admin-samples/spring-boot-admin-sample-reactive/pom.xml @@ -67,7 +67,7 @@ - de.codecentric.boot.admin.SpringBootAdminReactiveApplication + de.codecentric.boot.admin.sample.SpringBootAdminReactiveApplication false diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/java/de/codecentric/boot/admin/SpringBootAdminReactiveApplication.java b/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminReactiveApplication.java similarity index 94% rename from spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/java/de/codecentric/boot/admin/SpringBootAdminReactiveApplication.java rename to spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminReactiveApplication.java index bf6a597eac6..d08aa191b1f 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/java/de/codecentric/boot/admin/SpringBootAdminReactiveApplication.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminReactiveApplication.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import java.net.URI; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.security.config.Customizer; import org.springframework.security.config.web.server.ServerHttpSecurity; @@ -36,8 +35,7 @@ import de.codecentric.boot.admin.server.config.EnableAdminServer; import de.codecentric.boot.admin.server.notify.Notifier; -@Configuration(proxyBeanMethods = false) -@EnableAutoConfiguration +@SpringBootApplication @EnableAdminServer public class SpringBootAdminReactiveApplication { diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/test/java/de/codecentric/boot/admin/SpringBootAdminReactiveApplicationTest.java b/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminReactiveApplicationTest.java similarity index 96% rename from spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/test/java/de/codecentric/boot/admin/SpringBootAdminReactiveApplicationTest.java rename to spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminReactiveApplicationTest.java index acc279d963a..71ba957f745 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/test/java/de/codecentric/boot/admin/SpringBootAdminReactiveApplicationTest.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminReactiveApplicationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-servlet-graalvm/src/main/java/de/codecentric/boot/admin/SpringBootAdminServletApplication.java b/spring-boot-admin-samples/spring-boot-admin-sample-servlet-graalvm/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminServletApplication.java similarity index 79% rename from spring-boot-admin-samples/spring-boot-admin-sample-servlet-graalvm/src/main/java/de/codecentric/boot/admin/SpringBootAdminServletApplication.java rename to spring-boot-admin-samples/spring-boot-admin-sample-servlet-graalvm/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminServletApplication.java index 56f15cc7cc1..3538d981334 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-servlet-graalvm/src/main/java/de/codecentric/boot/admin/SpringBootAdminServletApplication.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-servlet-graalvm/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminServletApplication.java @@ -14,16 +14,14 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.context.annotation.Configuration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import de.codecentric.boot.admin.server.config.EnableAdminServer; -@Configuration(proxyBeanMethods = false) -@EnableAutoConfiguration +@SpringBootApplication @EnableAdminServer public class SpringBootAdminServletApplication { diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/pom.xml b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/pom.xml index 77aa16bacd5..2540eef4a4d 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/pom.xml +++ b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/pom.xml @@ -101,7 +101,7 @@ - de.codecentric.boot.admin.SpringBootAdminServletApplication + de.codecentric.boot.admin.sample.SpringBootAdminServletApplication false true diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/CustomCsrfFilter.java b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/CustomCsrfFilter.java similarity index 97% rename from spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/CustomCsrfFilter.java rename to spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/CustomCsrfFilter.java index 6e94f045381..e3530b6a79e 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/CustomCsrfFilter.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/CustomCsrfFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import java.io.IOException; diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/CustomEndpoint.java b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/CustomEndpoint.java similarity index 95% rename from spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/CustomEndpoint.java rename to spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/CustomEndpoint.java index fa6a48cc63a..a5eb998c5f3 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/CustomEndpoint.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/CustomEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/CustomNotifier.java b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/CustomNotifier.java similarity index 97% rename from spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/CustomNotifier.java rename to spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/CustomNotifier.java index 706fedc3803..f1a27d20d76 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/CustomNotifier.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/CustomNotifier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/NotifierConfig.java b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/NotifierConfig.java similarity index 98% rename from spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/NotifierConfig.java rename to spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/NotifierConfig.java index dafabdd809b..ea8e9be7cae 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/NotifierConfig.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/NotifierConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import java.time.Duration; import java.util.Collections; diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SecurityPermitAllConfig.java b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/SecurityPermitAllConfig.java similarity index 98% rename from spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SecurityPermitAllConfig.java rename to spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/SecurityPermitAllConfig.java index 5603e7672b1..7ad5f8e4bf6 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SecurityPermitAllConfig.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/SecurityPermitAllConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SecuritySecureConfig.java b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/SecuritySecureConfig.java similarity index 99% rename from spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SecuritySecureConfig.java rename to spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/SecuritySecureConfig.java index c1a6490b82e..59e49881417 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SecuritySecureConfig.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/SecuritySecureConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import java.util.UUID; diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SpringBootAdminServletApplication.java b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminServletApplication.java similarity index 91% rename from spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SpringBootAdminServletApplication.java rename to spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminServletApplication.java index 742bc712108..d5ff8df1025 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SpringBootAdminServletApplication.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminServletApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,14 +23,12 @@ import org.springframework.boot.actuate.audit.InMemoryAuditEventRepository; import org.springframework.boot.actuate.web.exchanges.HttpExchangeRepository; import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.EnableCaching; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -43,10 +41,8 @@ import de.codecentric.boot.admin.server.web.client.HttpHeadersProvider; import de.codecentric.boot.admin.server.web.client.InstanceExchangeFilterFunction; -@Configuration(proxyBeanMethods = false) -@EnableAutoConfiguration +@SpringBootApplication @EnableAdminServer -@Import({ SecurityPermitAllConfig.class, SecuritySecureConfig.class, NotifierConfig.class }) @Lazy(false) @EnableCaching public class SpringBootAdminServletApplication { diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/test/java/de/codecentric/boot/admin/SpringBootAdminServletApplicationTest.java b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminServletApplicationTest.java similarity index 96% rename from spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/test/java/de/codecentric/boot/admin/SpringBootAdminServletApplicationTest.java rename to spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminServletApplicationTest.java index d2cc4090a44..d58ce5ce880 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/test/java/de/codecentric/boot/admin/SpringBootAdminServletApplicationTest.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminServletApplicationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/java/de/codecentric/boot/admin/SpringBootAdminWarApplication.java b/spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminWarApplication.java similarity index 96% rename from spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/java/de/codecentric/boot/admin/SpringBootAdminWarApplication.java rename to spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminWarApplication.java index 5982d38a729..c6beb7706fb 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/java/de/codecentric/boot/admin/SpringBootAdminWarApplication.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminWarApplication.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.annotation.Bean; @@ -34,8 +34,7 @@ import de.codecentric.boot.admin.server.config.AdminServerProperties; import de.codecentric.boot.admin.server.config.EnableAdminServer; -@Configuration(proxyBeanMethods = false) -@EnableAutoConfiguration +@SpringBootApplication @EnableAdminServer public class SpringBootAdminWarApplication extends SpringBootServletInitializer { diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/docker-compose.yml b/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/docker-compose.yml new file mode 100644 index 00000000000..6ee07ed22b6 --- /dev/null +++ b/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/docker-compose.yml @@ -0,0 +1,5 @@ +services: + zookeeper: + image: zookeeper + ports: + - 2181:2181 diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/pom.xml b/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/pom.xml index cb0198985d3..8e319a90c78 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/pom.xml +++ b/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/pom.xml @@ -68,7 +68,7 @@ - de.codecentric.boot.admin.SpringBootAdminZookeeperApplication + de.codecentric.boot.admin.sample.SpringBootAdminZookeeperApplication false diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/src/main/java/de/codecentric/boot/admin/SpringBootAdminZookeeperApplication.java b/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminZookeeperApplication.java similarity index 96% rename from spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/src/main/java/de/codecentric/boot/admin/SpringBootAdminZookeeperApplication.java rename to spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminZookeeperApplication.java index 339a3ef8f36..516a788f162 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/src/main/java/de/codecentric/boot/admin/SpringBootAdminZookeeperApplication.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/src/main/java/de/codecentric/boot/admin/sample/SpringBootAdminZookeeperApplication.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -33,8 +33,7 @@ import de.codecentric.boot.admin.server.config.AdminServerProperties; import de.codecentric.boot.admin.server.config.EnableAdminServer; -@Configuration(proxyBeanMethods = false) -@EnableAutoConfiguration +@SpringBootApplication @EnableDiscoveryClient @EnableAdminServer public class SpringBootAdminZookeeperApplication { diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/src/test/java/de/codecentric/boot/admin/SpringBootAdminZookeeperApplicationTest.java b/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminZookeeperApplicationTest.java similarity index 96% rename from spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/src/test/java/de/codecentric/boot/admin/SpringBootAdminZookeeperApplicationTest.java rename to spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminZookeeperApplicationTest.java index e5970827f22..dfc99a22242 100644 --- a/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/src/test/java/de/codecentric/boot/admin/SpringBootAdminZookeeperApplicationTest.java +++ b/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/src/test/java/de/codecentric/boot/admin/sample/SpringBootAdminZookeeperApplicationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.codecentric.boot.admin; +package de.codecentric.boot.admin.sample; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith;