Introduce new spring properties setup for services. (#585)

* Introduce new spring properties setup for services.

This allows to configure a service directly from spring's properties file.
It also allows to set the executor for handler options, fixing #578

* Fix configuration properties metadata generation. This makes sure intellij will be able to pickup the restate spring properties

Author: slinkydeveloper

gradle/libs.versions.toml

@@ -177,6 +177,12 @@
     [libraries.spring-boot-starter-test.version]
       ref = 'spring-boot'
 
+  [libraries.spring-boot-configuration-processor]
+  module = 'org.springframework.boot:spring-boot-configuration-processor'
+
+    [libraries.spring-boot-configuration-processor.version]
+    ref = 'spring-boot'
+
   [libraries.vertx-core]
     module = 'io.vertx:vertx-core'
 
@@ -237,6 +243,6 @@
   protobuf = '4.29.3'
   restate = '2.6.0-SNAPSHOT'
   schema-kenerator = '2.1.2'
-  spring-boot = '3.4.9'
+  spring-boot = '3.5.10'
   vertx = '4.5.22'
   victools-json-schema = '4.38.0'

sdk-spring-boot-kotlin-starter/src/test/kotlin/dev/restate/sdk/springboot/kotlin/RestateHttpEndpointBeanTest.kt

@@ -10,6 +10,8 @@ package dev.restate.sdk.springboot.kotlin
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import dev.restate.sdk.core.generated.manifest.EndpointManifestSchema
+import dev.restate.sdk.springboot.RestateEndpointConfiguration
+import dev.restate.sdk.springboot.RestateHttpConfiguration
 import dev.restate.sdk.springboot.RestateHttpEndpointBean
 import java.io.IOException
 import java.net.URI
@@ -22,7 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 
 @SpringBootTest(
-    classes = [RestateHttpEndpointBean::class, Greeter::class],
+    classes =
+        [RestateEndpointConfiguration::class, RestateHttpConfiguration::class, Greeter::class],
     properties = ["restate.sdk.http.port=0"],
 )
 class RestateHttpEndpointBeanTest {

sdk-spring-boot-starter/src/test/java/dev/restate/sdk/springboot/java/RestateHttpEndpointBeanTest.java

@@ -12,19 +12,31 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import dev.restate.sdk.core.generated.manifest.EndpointManifestSchema;
+import dev.restate.sdk.springboot.RestateEndpointConfiguration;
+import dev.restate.sdk.springboot.RestateHttpConfiguration;
 import dev.restate.sdk.springboot.RestateHttpEndpointBean;
 import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.time.Duration;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest(
-    classes = {RestateHttpEndpointBean.class, Greeter.class, Configuration.class},
-    properties = {"restate.sdk.http.port=0"})
+    classes = {
+      RestateEndpointConfiguration.class,
+      RestateHttpConfiguration.class,
+      Greeter.class,
+      ServicesConfiguration.class
+    },
+    properties = {
+      "restate.sdk.http.port=0",
+      "restate.components.greeter.journal-retention=PT48H",
+      "greetingPrefix=Hello "
+    })
 public class RestateHttpEndpointBeanTest {
 
   @Autowired private RestateHttpEndpointBean restateHttpEndpointBean;
@@ -56,7 +68,8 @@ public void httpEndpointShouldBeRunning() throws IOException, InterruptedExcepti
     assertThat(endpointManifest.getServices())
         .extracting(
             dev.restate.sdk.core.generated.manifest.Service::getName,
-            dev.restate.sdk.core.generated.manifest.Service::getDocumentation)
-        .containsOnly(tuple("greeter", "blabla"));
+            dev.restate.sdk.core.generated.manifest.Service::getDocumentation,
+            dev.restate.sdk.core.generated.manifest.Service::getJournalRetention)
+        .containsOnly(tuple("greeter", "blabla", Duration.ofDays(2).toMillis()));
   }
 }

…e/sdk/springboot/java/Configuration.java …ringboot/java/ServicesConfiguration.javasdk-spring-boot-starter/src/test/java/dev/restate/sdk/springboot/java/Configuration.java renamed to sdk-spring-boot-starter/src/test/java/dev/restate/sdk/springboot/java/ServicesConfiguration.java sdk-spring-boot-starter/src/test/java/dev/restate/sdk/springboot/java/Configuration.java renamed to sdk-spring-boot-starter/src/test/java/dev/restate/sdk/springboot/java/ServicesConfiguration.java

@@ -8,12 +8,17 @@
 // https://github.com/restatedev/sdk-java/blob/main/LICENSE
 package dev.restate.sdk.springboot.java;
 
-import dev.restate.sdk.springboot.RestateServiceConfigurator;
+import dev.restate.sdk.springboot.RestateComponentProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ServicesConfiguration {
 
-public class Configuration {
   @Bean
-  public RestateServiceConfigurator greeterConfiguration() {
-    return configurator -> configurator.documentation("blabla");
+  public RestateComponentProperties greeterConfiguration() {
+    var properties = new RestateComponentProperties();
+    properties.setDocumentation("blabla");
+    return properties;
   }
 }

sdk-spring-boot/build.gradle.kts

@@ -10,6 +10,9 @@ description = "Restate SDK Spring Boot integration"
 dependencies {
   compileOnly(libs.jspecify)
 
+  // This generates the metadata needed for the configuration properties
+  annotationProcessor(libs.spring.boot.configuration.processor)
+
   val excludeJackson =
       fun ProjectDependency.() {
         // Let spring bring jackson in

sdk-spring-boot/src/main/java/dev/restate/sdk/springboot/EnableRestate.java

@@ -22,5 +22,9 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Import({RestateHttpEndpointBean.class, RestateClientAutoConfiguration.class})
+@Import({
+  RestateEndpointConfiguration.class,
+  RestateHttpConfiguration.class,
+  RestateClientAutoConfiguration.class
+})
 public @interface EnableRestate {}

sdk-spring-boot/src/main/java/dev/restate/sdk/springboot/RestateComponent.java

@@ -25,8 +25,9 @@
 @Component
 public @interface RestateComponent {
   /**
-   * Bean name to use to configure this component. The bean MUST be an instance of {@link
-   * RestateServiceConfigurator}.
+   * Bean name to use to configure this component.
+   *
+   * <p>The bean MUST be an instance of {@link RestateComponentProperties}.
    */
   String configuration() default "";
 }