From 4c1ee098f9e1c78f13f497c644c90f744d921053 Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Fri, 7 Feb 2025 12:37:18 -0600
Subject: [PATCH] Add servlet server starter module

This adds a starter module that includes the Spring gRPC server
starter and the required dependencies ((`spring-boot-starter-web`
and `jakarta-grpc-servlet`) to use the servlet container as a
gRPC server.

Signed-off-by: Chris Bono <chris.bono@gmail.com>
---
 pom.xml                                       |  1 +
 spring-grpc-dependencies/pom.xml              | 10 ++++++
 .../antora/modules/ROOT/pages/server.adoc     | 18 +++--------
 .../pom.xml                                   | 32 +++++++++++++++++++
 4 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 spring-grpc-server-web-spring-boot-starter/pom.xml

diff --git a/pom.xml b/pom.xml
index ca3567c..4a2a17b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
 		<module>spring-grpc-spring-boot-autoconfigure</module>
 		<module>spring-grpc-spring-boot-starter</module>
         <module>spring-grpc-client-spring-boot-starter</module>
+        <module>spring-grpc-server-web-spring-boot-starter</module>
 		<module>samples</module>
 	</modules>
 
diff --git a/spring-grpc-dependencies/pom.xml b/spring-grpc-dependencies/pom.xml
index 174d262..1fa606b 100644
--- a/spring-grpc-dependencies/pom.xml
+++ b/spring-grpc-dependencies/pom.xml
@@ -75,6 +75,16 @@
 				<artifactId>spring-grpc-spring-boot-starter</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+            <dependency>
+                <groupId>org.springframework.grpc</groupId>
+                <artifactId>spring-grpc-client-spring-boot-starter</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.grpc</groupId>
+                <artifactId>spring-grpc-server-web-spring-boot-starter</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 			<!-- Utilities -->
 			<dependency>
 				<groupId>org.springframework.grpc</groupId>
diff --git a/spring-grpc-docs/src/main/antora/modules/ROOT/pages/server.adoc b/spring-grpc-docs/src/main/antora/modules/ROOT/pages/server.adoc
index 7e0cc3f..231b4b0 100644
--- a/spring-grpc-docs/src/main/antora/modules/ROOT/pages/server.adoc
+++ b/spring-grpc-docs/src/main/antora/modules/ROOT/pages/server.adoc
@@ -59,21 +59,15 @@ dependencies {
 == Servlet Server
 
 Any servlet container can be used to run a gRPC server.
-Spring gRPC includes autoconfiguration that configures the server to use the servlet container if it detects that it is in a web application, so all you have to do is include `spring-boot-starter-web` and the `grpc-servlet` dependnecy in your application.
+Spring gRPC includes autoconfiguration that configures the server to use the servlet container if it detects that it is in a web application.
+Spring gRPC also provides a convenience starter that includes the required dependencies (`spring-boot-starter-web` and the `grpc-servlet-jakarta`) for this scenario.
+So all you have to do is include the `spring-boot-starter-web` dependency as follows:
 
 [source,xml]
 ----
-<dependency>
-	<groupId>org.springframework.boot</groupId>
-	<artifactId>spring-boot-starter-web</artifactId>
-</dependency>
 <dependency>
 	<groupId>org.springframework.grpc</groupId>
-	<artifactId>spring-grpc-spring-boot-starter</artifactId>
-</dependency>
-<dependency>
-	<groupId>io.grpc</groupId>
-	<artifactId>grpc-servlet-jakarta</artifactId>
+	<artifactId>spring-grpc-server-web-spring-boot-starter</artifactId>
 </dependency>
 ----
 
@@ -82,9 +76,7 @@ For Gradle users
 [source,gradle]
 ----
 dependencies {
-    implementation "org.springframework.boot:spring-boot-starter-web"
-    implementation "org.springframework.grpc:spring-grpc-spring-boot-starter"
-    implementation "io.grpc:grpc-servlet-jakarta"
+    implementation "org.springframework.grpc:spring-grpc-server-web-spring-boot-starter"
 }
 ----
 
diff --git a/spring-grpc-server-web-spring-boot-starter/pom.xml b/spring-grpc-server-web-spring-boot-starter/pom.xml
new file mode 100644
index 0000000..53e65b2
--- /dev/null
+++ b/spring-grpc-server-web-spring-boot-starter/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.grpc</groupId>
+		<artifactId>spring-grpc</artifactId>
+		<version>0.4.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-grpc-server-web-spring-boot-starter</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring gRPC Servlet Server Spring Boot Starter</name>
+	<description>Spring gRPC Servlet Server Spring Boot Starter</description>
+
+	<dependencies>
+        <dependency>
+            <groupId>org.springframework.grpc</groupId>
+            <artifactId>spring-grpc-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-servlet-jakarta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot.version}</version>
+        </dependency>
+	</dependencies>
+
+</project>