[spike / WIP] TMMM-237: Close JPA session early

src/main/java/org/tailormap/api/controller/GeoServiceProxyController.java

@@ -34,6 +34,7 @@
 
 import io.micrometer.core.annotation.Timed;
 import jakarta.annotation.Nullable;
+import jakarta.persistence.EntityManager;
 import jakarta.servlet.http.HttpServletRequest;
 import java.io.InputStream;
 import java.lang.invoke.MethodHandles;
@@ -96,6 +97,7 @@ public class GeoServiceProxyController {
       LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private final AuthorisationService authorisationService;
   private final HttpClient httpClient;
+  private final EntityManager entityManager;
 
   public static final String TILES3D_DESCRIPTION_PATH = "tiles3dDescription";
 
@@ -105,8 +107,9 @@ public class GeoServiceProxyController {
   @Value("${tailormap-api.proxy.passthrough.hostnames:}")
   private Set<String> proxyPassthroughHostNames = Set.of();
 
-  public GeoServiceProxyController(AuthorisationService authorisationService) {
+  public GeoServiceProxyController(AuthorisationService authorisationService, EntityManager entityManager) {
     this.authorisationService = authorisationService;
+    this.entityManager = entityManager;
 
     final HttpClient.Builder builder = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.NORMAL);
     this.httpClient = builder.build();
@@ -123,6 +126,9 @@ public ResponseEntity<?> proxy3dtiles(
 
     checkRequestValidity(application, service, layer, GeoServiceProtocol.TILES3D, request);
 
+    // after all validations we can close the JPA session
+    this.entityManager.close();
+
     return doProxy(build3DTilesUrl(service, request), service, request);
   }
 
@@ -139,6 +145,9 @@ public ResponseEntity<?> proxy(
 
     checkRequestValidity(application, service, layer, protocol, request);
 
+    // after all validations we can close the JPA session
+    this.entityManager.close();
+
     return switch (protocol) {
       case WMS, WMTS -> doProxy(buildWMSUrl(service, request), service, request);
       case LEGEND -> {

src/main/java/org/tailormap/api/controller/LayerExtractController.java

@@ -9,6 +9,7 @@
 
 import io.micrometer.core.annotation.Counted;
 import io.micrometer.core.annotation.Timed;
+import jakarta.persistence.EntityManager;
 import jakarta.validation.Valid;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
@@ -67,17 +68,20 @@ public class LayerExtractController {
   private final FeatureSourceRepository featureSourceRepository;
   private final CreateLayerExtractService createLayerExtractService;
   private final FeatureSourceFactoryHelper featureSourceFactoryHelper;
+  private final EntityManager entityManager;
 
   @Value("#{'${tailormap-api.extract.allowed-outputformats}'.split(',')}")
   private List<ExtractOutputFormat> allowedExtractOutputFormats;
 
   public LayerExtractController(
       FeatureSourceRepository featureSourceRepository,
       CreateLayerExtractService createLayerExtractService,
-      FeatureSourceFactoryHelper featureSourceFactoryHelper) {
+      FeatureSourceFactoryHelper featureSourceFactoryHelper,
+      EntityManager entityManager) {
     this.featureSourceRepository = featureSourceRepository;
     this.createLayerExtractService = createLayerExtractService;
     this.featureSourceFactoryHelper = featureSourceFactoryHelper;
+    this.entityManager = entityManager;
   }
 
   /**
@@ -137,7 +141,7 @@ public ResponseEntity<?> formats(
         .toList());
   }
 
-  @Transactional
+  @Transactional(readOnly = true)
   @PostMapping("/{clientId}")
   @Timed(value = "tailormap_api_extract", description = "Time taken to process a layer extract request")
   public ResponseEntity<?> extract(
@@ -213,6 +217,9 @@ public ResponseEntity<?> extract(
       validateExcelLimits(sourceFT, attributes, parsedCQL);
     }
 
+    // after all validations we can close the JPA session
+    this.entityManager.close();
+
     SortOrder sortingOrder = SortOrder.ASCENDING;
     if (null != sortOrder && (sortOrder.equalsIgnoreCase("desc") || sortOrder.equalsIgnoreCase("asc"))) {
       sortingOrder = SortOrder.valueOf(sortOrder.toUpperCase(Locale.ROOT));