Refactor PublicationDeliveryImporter makes AuthorizationService confi…

…gurable with spring properties.
entur · Oct 8, 2024 · 2db1415 · 2db1415
1 parent 6df41a0
commit 2db1415
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/java/org/rutebanken/tiamat/importer/PublicationDeliveryImporter.java b/src/main/java/org/rutebanken/tiamat/importer/PublicationDeliveryImporter.java
@@ -34,6 +34,7 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.Timer;
@@ -59,6 +60,7 @@ public class PublicationDeliveryImporter {
     private final TopographicPlaceImportHandler topographicPlaceImportHandler;
     private final BackgroundJobs backgroundJobs;
     private final AuthorizationService authorizationService;
+    private final boolean authorizationEnabled;
 
     @Autowired
     public PublicationDeliveryImporter(PublicationDeliveryHelper publicationDeliveryHelper, NetexMapper netexMapper,
@@ -69,7 +71,9 @@ public PublicationDeliveryImporter(PublicationDeliveryHelper publicationDelivery
                                        GroupOfTariffZonesImportHandler groupOfTariffZonesImportHandler,
                                        StopPlaceImportHandler stopPlaceImportHandler,
                                        ParkingsImportHandler parkingsImportHandler,
-                                       BackgroundJobs backgroundJobs, AuthorizationService authorizationService) {
+                                       BackgroundJobs backgroundJobs,
+                                       AuthorizationService authorizationService,
+                                       @Value("${authorization.enabled:true}") boolean authorizationEnabled) {
         this.publicationDeliveryHelper = publicationDeliveryHelper;
         this.parkingsImportHandler = parkingsImportHandler;
         this.publicationDeliveryCreator = publicationDeliveryCreator;
@@ -80,6 +84,7 @@ public PublicationDeliveryImporter(PublicationDeliveryHelper publicationDelivery
         this.stopPlaceImportHandler = stopPlaceImportHandler;
         this.backgroundJobs = backgroundJobs;
         this.authorizationService = authorizationService;
+        this.authorizationEnabled = authorizationEnabled;
     }
 
 
@@ -89,8 +94,9 @@ public PublicationDeliveryStructure importPublicationDelivery(PublicationDeliver
 
     @SuppressWarnings("unchecked")
     public PublicationDeliveryStructure importPublicationDelivery(PublicationDeliveryStructure incomingPublicationDelivery, ImportParams importParams) {
-
-        authorizationService.verifyCanEditAllEntities();
+        if(authorizationEnabled){
+            authorizationService.verifyCanEditAllEntities();
+        }
 
         if (incomingPublicationDelivery.getDataObjects() == null) {
             String responseMessage = "Received publication delivery but it does not contain any data objects.";