Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Samples use @SpringBootApplication #3297

Merged
merged 2 commits into from
Apr 15, 2024
Merged

Samples use @SpringBootApplication #3297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1b1d2a
Samples use @SpringBootApplication
hzpz Apr 12, 2024
66633f4
Samples use @SpringBootApplication
hzpz Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spring-boot-admin-docs/src/site/asciidoc/_server-clustering.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-docs/src/site/asciidoc/customize_http-headers.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
----
2 changes: 1 addition & 1 deletion spring-boot-admin-docs/src/site/asciidoc/customize_interceptors.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
----
2 changes: 1 addition & 1 deletion spring-boot-admin-docs/src/site/asciidoc/customize_notifiers.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
----
3 changes: 1 addition & 2 deletions spring-boot-admin-docs/src/site/asciidoc/getting-started.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-docs/src/site/asciidoc/security.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-docs/src/site/asciidoc/server-notifications.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-samples/spring-boot-admin-sample-consul/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
services:
consul:
image: library/consul
image: hashicorp/consul
ports:
- "8500:8500"
2 changes: 1 addition & 1 deletion spring-boot-admin-samples/spring-boot-admin-sample-consul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</execution>
</executions>
<configuration>
<mainClass>de.codecentric.boot.admin.SpringBootAdminConsulApplication</mainClass>
<mainClass>de.codecentric.boot.admin.sample.SpringBootAdminConsulApplication</mainClass>
<addResources>false</addResources>
</configuration>
</plugin>
Expand Down
7 changes: 3 additions & 4 deletions ...min/SpringBootAdminConsulApplication.java → ...ple/SpringBootAdminConsulApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...SpringBootAdminConsulApplicationTest.java → ...SpringBootAdminConsulApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</execution>
</executions>
<configuration>
<mainClass>de.codecentric.boot.admin.SpringBootAdminHazelcastApplication</mainClass>
<mainClass>de.codecentric.boot.admin.sample.SpringBootAdminHazelcastApplication</mainClass>
<addResources>false</addResources>
</configuration>
</plugin>
Expand Down
7 changes: 3 additions & 4 deletions .../SpringBootAdminHazelcastApplication.java → .../SpringBootAdminHazelcastApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ...ingBootAdminHazelcastApplicationTest.java → ...ingBootAdminHazelcastApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-samples/spring-boot-admin-sample-reactive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
</execution>
</executions>
<configuration>
<mainClass>de.codecentric.boot.admin.SpringBootAdminReactiveApplication</mainClass>
<mainClass>de.codecentric.boot.admin.sample.SpringBootAdminReactiveApplication</mainClass>
<addResources>false</addResources>
</configuration>
</plugin>
Expand Down
8 changes: 3 additions & 5 deletions ...n/SpringBootAdminReactiveApplication.java → ...e/SpringBootAdminReactiveApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ...ringBootAdminReactiveApplicationTest.java → ...ringBootAdminReactiveApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 3 additions & 5 deletions ...in/SpringBootAdminServletApplication.java → ...le/SpringBootAdminServletApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-samples/spring-boot-admin-sample-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
</execution>
</executions>
<configuration>
<mainClass>de.codecentric.boot.admin.SpringBootAdminServletApplication</mainClass>
<mainClass>de.codecentric.boot.admin.sample.SpringBootAdminServletApplication</mainClass>
<addResources>false</addResources>
<executable>true</executable>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion ...ecentric/boot/admin/CustomCsrfFilter.java → ...c/boot/admin/sample/CustomCsrfFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package de.codecentric.boot.admin;
package de.codecentric.boot.admin.sample;

import java.io.IOException;

Expand Down
2 changes: 1 addition & 1 deletion ...odecentric/boot/admin/CustomEndpoint.java → ...ric/boot/admin/sample/CustomEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...odecentric/boot/admin/CustomNotifier.java → ...ric/boot/admin/sample/CustomNotifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...odecentric/boot/admin/NotifierConfig.java → ...ric/boot/admin/sample/NotifierConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...c/boot/admin/SecurityPermitAllConfig.java → ...admin/sample/SecurityPermitAllConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...tric/boot/admin/SecuritySecureConfig.java → ...ot/admin/sample/SecuritySecureConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package de.codecentric.boot.admin;
package de.codecentric.boot.admin.sample;

import java.util.UUID;

Expand Down
10 changes: 3 additions & 7 deletions ...in/SpringBootAdminServletApplication.java → ...le/SpringBootAdminServletApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...pringBootAdminServletApplicationTest.java → ...pringBootAdminServletApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 3 additions & 4 deletions .../admin/SpringBootAdminWarApplication.java → ...sample/SpringBootAdminWarApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
5 changes: 5 additions & 0 deletions spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
services:
zookeeper:
image: zookeeper
ports:
- 2181:2181
2 changes: 1 addition & 1 deletion spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</execution>
</executions>
<configuration>
<mainClass>de.codecentric.boot.admin.SpringBootAdminZookeeperApplication</mainClass>
<mainClass>de.codecentric.boot.admin.sample.SpringBootAdminZookeeperApplication</mainClass>
<addResources>false</addResources>
</configuration>
</plugin>
Expand Down
7 changes: 3 additions & 4 deletions .../SpringBootAdminZookeeperApplication.java → .../SpringBootAdminZookeeperApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...ingBootAdminZookeeperApplicationTest.java → ...ingBootAdminZookeeperApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading