Revert "Core: Finished transition period for HttpServerOptions (#2643)"

This reverts commit 3e1dece.
prebid · Oct 25, 2023 · 63e6a67 · 63e6a67
1 parent d49dd50
commit 63e6a67
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/org/prebid/server/spring/config/WebConfiguration.java b/src/main/java/org/prebid/server/spring/config/WebConfiguration.java
@@ -81,14 +81,14 @@ public class WebConfiguration {
     @Autowired
     private Vertx vertx;
 
-    @Bean
+    @Bean // TODO: remove support for properties with http prefix after transition period
     HttpServerOptions httpServerOptions(
-            @Value("${server.max-headers-size}") int maxHeaderSize,
-            @Value("${server.max-initial-line-length}") int maxInitialLineLength,
-            @Value("${server.ssl}") boolean ssl,
-            @Value("${server.jks-path}") String jksPath,
-            @Value("${server.jks-password}") String jksPassword,
-            @Value("${server.idle-timeout}") int idleTimeout,
+            @Value("#{'${http.max-headers-size:${server.max-headers-size:}}'}") int maxHeaderSize,
+            @Value("#{'${http.max-initial-line-length:${server.max-initial-line-length:}}'}") int maxInitialLineLength,
+            @Value("#{'${http.ssl:${server.ssl:}}'}") boolean ssl,
+            @Value("#{'${http.jks-path:${server.jks-path:}}'}") String jksPath,
+            @Value("#{'${http.jks-password:${server.jks-password:}}'}") String jksPassword,
+            @Value("#{'${http.idle-timeout:${server.idle-timeout}}'}") int idleTimeout,
             @Value("${server.enable-quickack:#{null}}") Optional<Boolean> enableQuickAck,
             @Value("${server.enable-reuseport:#{null}}") Optional<Boolean> enableReusePort) {
 

diff --git a/src/main/java/org/prebid/server/spring/config/server/HttpServerConfiguration.java b/src/main/java/org/prebid/server/spring/config/server/HttpServerConfiguration.java
@@ -38,10 +38,11 @@ public class HttpServerConfiguration {
     @Qualifier("router")
     private Router router;
 
-    @Value("${server.http.port}")
+    @Value("#{'${http.port:${server.http.port}}'}")
     private Integer httpPort;
 
-    @Value("${server.http.server-instances}")
+    // TODO: remove support for properties with http prefix after transition period
+    @Value("#{'${vertx.http-server-instances:${server.http.server-instances}}'}")
     private Integer httpServerNum;
 
     @PostConstruct