Merge pull request #309 from entur/feature/stop-place-by-scheduled-stop-point

Author: testower

src/main/java/no/entur/mummu/config/SwaggerConfiguration.java

@@ -5,18 +5,29 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import io.swagger.v3.core.converter.ModelConverters;
 import io.swagger.v3.core.jackson.ModelResolver;
+import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.servers.Server;
+import org.springdoc.core.customizers.SpringDocCustomizers;
+import org.springdoc.core.properties.SpringDocConfigProperties;
+import org.springdoc.core.providers.ObjectMapperProvider;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
 import java.util.List;
 
 @Configuration
 public class SwaggerConfiguration {
 
+    static {
+        // Configure swagger-core's global JSON mapper for OpenAPI serialization
+        // This must be done in a static block to run before any OpenAPI processing
+        ObjectMapper globalMapper = Json.mapper();
+        globalMapper.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true);
+        globalMapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true);
+    }
+
     @Value("${no.entur.mummu.swagger.host.url}")
     private String hostUrl;
 
@@ -26,24 +37,28 @@ public SwaggerConfiguration() {
         objectMapper.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true);
         objectMapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true);
 
+        // Configure swagger-core's JSON mapper for schema generation
         ModelConverters.getInstance().addConverter(new ModelResolver(objectMapper));
         ModelConverters.getInstance().addConverter(new CustomConverters());
     }
 
-    @Bean
-    public Jackson2ObjectMapperBuilder jackson2ObjectMapperBuilder() {
-        Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder();
-        builder.featuresToEnable(
-            SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS,
-            MapperFeature.SORT_PROPERTIES_ALPHABETICALLY
-        );
-        return builder;
-    }
-
     @Bean
     public OpenAPI customOpenAPI() {
         Server server = new Server();
         server.setUrl(hostUrl);
         return new OpenAPI().servers(List.of(server));
     }
+
+    @Bean
+    public ObjectMapperProvider springDocObjectMapperProvider() {
+        return new ObjectMapperProvider(new SpringDocConfigProperties()) {
+            @Override
+            public ObjectMapper jsonMapper() {
+                ObjectMapper mapper = super.jsonMapper();
+                mapper.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true);
+                mapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true);
+                return mapper;
+            }
+        };
+    }
 }

src/main/java/no/entur/mummu/resources/RestResource.java

@@ -466,4 +466,14 @@ public ScheduledStopPoint getScheduledStopPointById(@PathVariable String id) {
     public JAXBElement<ScheduledStopPoint> getJAXBElementScheduledStopPointById(@PathVariable String id) {
         return netexObjectFactory.createScheduledStopPoint(netexEntitiesService.getScheduledStopPoint(id));
     }
+
+    @GetMapping(value = "/scheduled-stop-points/{id}/stop-place", produces = "application/json")
+    public StopPlace getStopPlaceByScheduledStopPointId(@PathVariable String id) {
+        return netexEntitiesService.getStopPlaceByScheduledStopPointId(id);
+    }
+
+    @GetMapping(value = "/scheduled-stop-points/{id}/stop-place", produces = "application/xml")
+    public JAXBElement<StopPlace> getJAXBElementStopPlacesByScheduledStopPointId(@PathVariable String id) {
+        return netexObjectFactory.createStopPlace(netexEntitiesService.getStopPlaceByScheduledStopPointId(id));
+    }
 }

src/main/java/no/entur/mummu/services/NetexEntitiesService.java

@@ -29,6 +29,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -336,4 +337,18 @@ public Collection<ScheduledStopPoint> getScheduledStopPointsForStopPlaceWithId(S
     public ScheduledStopPoint getScheduledStopPoint(String id) {
         return netexEntitiesIndex.getScheduledStopPointIndex().getLatestVersion(id);
     }
+
+    public StopPlace getStopPlaceByScheduledStopPointId(String id) {
+        return netexEntitiesIndex.getPassengerStopAssignmentsByStopPointRefIndex().get(id).stream()
+                .filter(Objects::nonNull)
+                .filter(passengerStopAssignment -> passengerStopAssignment.getStopPlaceRef() != null)
+                .map(
+                passengerStopAssignment ->
+                        netexEntitiesIndex.getStopPlaceIndex().getVersion(
+                                passengerStopAssignment.getStopPlaceRef().getRef(),
+                                passengerStopAssignment.getStopPlaceRef().getVersion()
+                        )
+
+        ).findFirst().orElseThrow(NotFoundException::new);
+    }
 }