Skip to content

Commit 30b5e29

Browse files
wilkinsonawilkinsona
committed
Create spring-boot-jersey module
1 parent a19c864 commit 30b5e29

File tree

49 files changed

+113
-67
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+113
-67
lines changed

‎settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ include "spring-boot-project:spring-boot-hazelcast"
6969
include "spring-boot-project:spring-boot-integration"
7070
include "spring-boot-project:spring-boot-jackson"
7171
include "spring-boot-project:spring-boot-jdbc"
72+
include "spring-boot-project:spring-boot-jersey"
7273
include "spring-boot-project:spring-boot-jetty"
7374
include "spring-boot-project:spring-boot-jms"
7475
include "spring-boot-project:spring-boot-jooq"

‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ dependencies {
3030
optional(project(":spring-boot-project:spring-boot-integration"))
3131
optional(project(":spring-boot-project:spring-boot-jackson"))
3232
optional(project(":spring-boot-project:spring-boot-jdbc"))
33+
optional(project(":spring-boot-project:spring-boot-jersey"))
3334
optional(project(":spring-boot-project:spring-boot-jetty"))
3435
optional(project(":spring-boot-project:spring-boot-jsonb"))
3536
optional(project(":spring-boot-project:spring-boot-kafka"))

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
28-
import org.springframework.boot.autoconfigure.jersey.JerseyApplicationPath;
2928
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletPath;
29+
import org.springframework.boot.jersey.autoconfigure.JerseyApplicationPath;
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Configuration;
3232
import org.springframework.web.servlet.DispatcherServlet;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@
5757
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
5858
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
5959
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
60-
import org.springframework.boot.autoconfigure.jersey.ResourceConfigCustomizer;
60+
import org.springframework.boot.jersey.autoconfigure.ResourceConfigCustomizer;
6161
import org.springframework.context.annotation.Bean;
6262
import org.springframework.core.env.Environment;
6363
import org.springframework.util.StringUtils;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -44,11 +44,11 @@
4444
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
4545
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
4646
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
47-
import org.springframework.boot.autoconfigure.jersey.DefaultJerseyApplicationPath;
48-
import org.springframework.boot.autoconfigure.jersey.JerseyApplicationPath;
49-
import org.springframework.boot.autoconfigure.jersey.JerseyProperties;
50-
import org.springframework.boot.autoconfigure.jersey.ResourceConfigCustomizer;
5147
import org.springframework.boot.context.properties.EnableConfigurationProperties;
48+
import org.springframework.boot.jersey.autoconfigure.DefaultJerseyApplicationPath;
49+
import org.springframework.boot.jersey.autoconfigure.JerseyApplicationPath;
50+
import org.springframework.boot.jersey.autoconfigure.JerseyProperties;
51+
import org.springframework.boot.jersey.autoconfigure.ResourceConfigCustomizer;
5252
import org.springframework.boot.web.servlet.ServletRegistrationBean;
5353
import org.springframework.context.annotation.Bean;
5454
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -32,8 +32,8 @@
3232
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3333
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3434
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
35-
import org.springframework.boot.autoconfigure.jersey.ResourceConfigCustomizer;
3635
import org.springframework.boot.context.properties.EnableConfigurationProperties;
36+
import org.springframework.boot.jersey.autoconfigure.ResourceConfigCustomizer;
3737
import org.springframework.context.annotation.Bean;
3838
import org.springframework.core.annotation.Order;
3939

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/SecurityRequestMatchersManagementContextConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
27-
import org.springframework.boot.autoconfigure.jersey.JerseyApplicationPath;
2827
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletPath;
28+
import org.springframework.boot.jersey.autoconfigure.JerseyApplicationPath;
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.context.annotation.Configuration;
3131
import org.springframework.security.web.util.matcher.RequestMatcher;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyChildManagementContextConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
27-
import org.springframework.boot.autoconfigure.jersey.JerseyApplicationPath;
27+
import org.springframework.boot.jersey.autoconfigure.JerseyApplicationPath;
2828
import org.springframework.context.annotation.Bean;
2929
import org.springframework.context.annotation.Import;
3030

@@ -39,7 +39,7 @@
3939
@ManagementContextConfiguration(value = ManagementContextType.CHILD, proxyBeanMethods = false)
4040
@Import(JerseyManagementContextConfiguration.class)
4141
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
42-
@ConditionalOnClass(ResourceConfig.class)
42+
@ConditionalOnClass({ JerseyApplicationPath.class, ResourceConfig.class })
4343
@ConditionalOnMissingClass("org.springframework.web.servlet.DispatcherServlet")
4444
public class JerseyChildManagementContextConfiguration {
4545

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyManagementContextConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
import org.glassfish.jersey.server.ResourceConfig;
2020
import org.glassfish.jersey.servlet.ServletContainer;
2121

22-
import org.springframework.boot.autoconfigure.jersey.JerseyApplicationPath;
22+
import org.springframework.boot.jersey.autoconfigure.JerseyApplicationPath;
2323
import org.springframework.boot.web.servlet.ServletRegistrationBean;
2424
import org.springframework.context.annotation.Bean;
2525
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfiguration.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,11 +25,11 @@
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
28-
import org.springframework.boot.autoconfigure.jersey.DefaultJerseyApplicationPath;
29-
import org.springframework.boot.autoconfigure.jersey.JerseyApplicationPath;
30-
import org.springframework.boot.autoconfigure.jersey.JerseyProperties;
31-
import org.springframework.boot.autoconfigure.jersey.ResourceConfigCustomizer;
3228
import org.springframework.boot.context.properties.EnableConfigurationProperties;
29+
import org.springframework.boot.jersey.autoconfigure.DefaultJerseyApplicationPath;
30+
import org.springframework.boot.jersey.autoconfigure.JerseyApplicationPath;
31+
import org.springframework.boot.jersey.autoconfigure.JerseyProperties;
32+
import org.springframework.boot.jersey.autoconfigure.ResourceConfigCustomizer;
3333
import org.springframework.context.annotation.Bean;
3434
import org.springframework.context.annotation.Configuration;
3535
import org.springframework.context.annotation.Import;
@@ -44,7 +44,7 @@
4444
@ManagementContextConfiguration(value = ManagementContextType.SAME, proxyBeanMethods = false)
4545
@EnableConfigurationProperties(JerseyProperties.class)
4646
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
47-
@ConditionalOnClass(ResourceConfig.class)
47+
@ConditionalOnClass({ JerseyApplicationPath.class, ResourceConfig.class })
4848
@ConditionalOnMissingClass("org.springframework.web.servlet.DispatcherServlet")
4949
public class JerseySameManagementContextConfiguration {
5050

0 commit comments

Comments
 (0)