diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 7da2678..96b914a 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -23,7 +23,7 @@ jobs: wget https://raw.githubusercontent.com/entur/ror-maven-settings/master/.m2/settings.xml -O .github/workflows/settings.xml - uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 21 distribution: liberica - name: Cache Maven dependencies uses: actions/cache@v4 diff --git a/Dockerfile b/Dockerfile index c2a5a10..a8fb465 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11:alpine-jre +FROM bellsoft/liberica-openjdk-alpine:21.0.5-11 WORKDIR /deployments COPY target/asag-*-SNAPSHOT.jar asag.jar RUN addgroup appuser && adduser --disabled-password appuser --ingroup appuser diff --git a/helm/asag/values.yaml b/helm/asag/values.yaml index e9b1e38..dc8e174 100644 --- a/helm/asag/values.yaml +++ b/helm/asag/values.yaml @@ -26,7 +26,7 @@ common: enabled: false configmap: data: - JAVA_OPTIONS: -server -Xmx1500m -Dfile.encoding=UTF-8 + JDK_JAVA_OPTIONS: -server -Xmx1500m -Dfile.encoding=UTF-8 TZ: Europe/Oslo MAPBOX_DOWNLOAD_DIRECTORY: files/tmp/mapbox enabled: true diff --git a/pom.xml b/pom.xml index a8bf681..1aead0d 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.entur.ror + superpom + 3.4 + org.entur.asag asag @@ -30,66 +35,38 @@ scm:git:ssh://git@github.com:entur/asag.git scm:git:ssh://git@github.com:entur/asag.git - - UTF-8 - 0.21.0 - 2.1.1.RELEASE - 2.1.1.RELEASE - 4.5.2 - 3.3.0 - 2.22.3 - 4.2.3.RELEASE - 1.0.13 - 1.86 - 26.0-jre - 5.2.3.Final - 1.8.1 - 5.3 - 1.18 - 1.3.2 - 1.2.2.RELEASE - 1.11.502 - 2.3.0 - 2.3.0.1 - 1.2.0 - 3.0.3 - 3.8.0 + 21 + 4.8.4 + 4.9 + 2.0.14 + 2.1.0 + 0.22 + write + + + 5.1 + 1.14 + 1.12.782 + 4.1.2 - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} + org.apache.camel.springboot + camel-spring-boot-bom + ${camel.version} pom import - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - de.grundid.opendatalab - geojson-jackson - ${geojson-jackson.version} - - - net.logstash.logback - logstash-logback-encoder - ${logstash-logback-encoder.version} - + org.entur.ror.helpers - gcp-storage + storage-gcp-gcs ${entur.helpers.version} @@ -104,99 +81,50 @@ com.google.protobuf protobuf-lite - - com.google.guava - guava - - - com.google.guava - guava - ${guava.version} + org.entur + netex-java-model + ${netex-java-model.version} org.entur.ror.helpers slack - ${entur.helpers.version} - - - - org.apache.camel - camel-http-common - ${camel-version} - - - org.apache.camel - camel-spring - ${camel-version} - - - org.apache.camel - camel-core - ${camel-version} - - - org.apache.camel - camel-http4 - ${camel-version} - - - org.apache.camel - camel-spring-boot - ${camel-version} - - - org.apache.camel - camel-jaxb - ${camel-version} - - - org.apache.camel - camel-netty4-http - ${camel-version} - - - org.apache.camel - camel-jsonpath - ${camel-version} - - - org.apache.httpcomponents - httpmime - ${httpcomponents.version} + ${helper.slack.version} + - org.apache.httpcomponents - httpclient - ${httpcomponents.version} + org.springframework.boot + spring-boot-starter-json + - org.springframework.boot - spring-boot-starter + org.apache.camel.springboot + camel-spring-boot-starter - org.entur - netex-java-model - ${netex-java-model.version} + org.apache.camel.springboot + camel-http-starter - org.apache.commons - commons-compress - ${commons-compress.version} + org.apache.camel.springboot + camel-jackson-starter + + - commons-io - commons-io - ${commons-io.version} + de.grundid.opendatalab + geojson-jackson + ${geojson-jackson.version} - org.apache.camel - camel-spring-javaconfig - ${camel-version} - test + com.amazonaws + aws-java-sdk-s3 + ${aws-java-sdk-s3.version} + + org.springframework.boot spring-boot-starter-test @@ -204,26 +132,7 @@ org.apache.camel - camel-test-spring - ${camel-version} - test - - - org.apache.camel - camel-test - ${camel-version} - test - - - org.assertj - assertj-core - ${assertj-core.version} - test - - - junit - junit - 4.12 + camel-test-spring-junit5 test @@ -232,36 +141,7 @@ ${spring-cloud-contract-wiremock.version} test - - com.amazonaws - aws-java-sdk-s3 - ${aws-java-sdk-s3.version} - - - org.apache.camel - camel-jackson - ${camel-version} - - - javax.xml.bind - jaxb-api - ${jaxb-api.version} - - - org.glassfish.jaxb - jaxb-runtime - ${jaxb-runtime.version} - - - com.sun.activation - javax.activation - ${javax.activation.version} - - - com.github.seratch - jslack-api-client - ${jslack-api-client.version} - + @@ -269,7 +149,6 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot-plugin.version} @@ -278,15 +157,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 11 - - diff --git a/src/main/java/org/entur/asag/AsagApp.java b/src/main/java/org/entur/asag/AsagApp.java index 1c788d7..e8aa3a4 100644 --- a/src/main/java/org/entur/asag/AsagApp.java +++ b/src/main/java/org/entur/asag/AsagApp.java @@ -15,12 +15,12 @@ package org.entur.asag; -import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelSpringBootApplicationController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -33,7 +33,7 @@ public class AsagApp extends RouteBuilder { private static final Logger logger = LoggerFactory.getLogger(AsagApp.class); - @Produce(uri = "direct:uploadTiamatToMapboxAsGeoJson") + @Autowired ProducerTemplate producerTemplate; public static void main(String... args) throws Exception { @@ -48,10 +48,13 @@ public static void main(String... args) throws Exception { AsagApp asagApp = applicationContext.getBean(AsagApp.class); asagApp.run(); + } private void run() { - producerTemplate.request("direct:uploadTiamatToMapboxAsGeoJson", System.out::println); + + producerTemplate.sendBody("direct:uploadTiamatToMapboxAsGeoJson", "Startup payload"); + logger.info("Sent message to direct:uploadTiamatToMapboxAsGeoJson"); } @Override diff --git a/src/main/java/org/entur/asag/mapbox/AwsS3Uploader.java b/src/main/java/org/entur/asag/mapbox/AwsS3Uploader.java index d192bf0..d5a3d8e 100644 --- a/src/main/java/org/entur/asag/mapbox/AwsS3Uploader.java +++ b/src/main/java/org/entur/asag/mapbox/AwsS3Uploader.java @@ -20,6 +20,7 @@ import com.amazonaws.regions.Region; import com.amazonaws.regions.Regions; import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.AmazonS3ClientBuilder; import com.amazonaws.services.s3.model.ObjectMetadata; import org.apache.camel.Body; import org.apache.camel.Header; @@ -45,7 +46,6 @@ public class AwsS3Uploader { public AmazonS3Client createClient(MapBoxAwsCredentials mapBoxAwsCredentials) { AWSCredentials credentials = new BasicSessionCredentials(mapBoxAwsCredentials.getAccessKeyId(), mapBoxAwsCredentials.getSecretAccessKey(), mapBoxAwsCredentials.getSessionToken()); - return new AmazonS3Client(credentials); } diff --git a/src/main/java/org/entur/asag/mapbox/DeliveryPublicationStreamToGeoJson.java b/src/main/java/org/entur/asag/mapbox/DeliveryPublicationStreamToGeoJson.java index 09e2a44..3fb0c27 100644 --- a/src/main/java/org/entur/asag/mapbox/DeliveryPublicationStreamToGeoJson.java +++ b/src/main/java/org/entur/asag/mapbox/DeliveryPublicationStreamToGeoJson.java @@ -29,8 +29,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.events.StartElement; diff --git a/src/main/java/org/entur/asag/mapbox/MapBoxUpdateRouteBuilder.java b/src/main/java/org/entur/asag/mapbox/MapBoxUpdateRouteBuilder.java index 1cae985..04ecda0 100644 --- a/src/main/java/org/entur/asag/mapbox/MapBoxUpdateRouteBuilder.java +++ b/src/main/java/org/entur/asag/mapbox/MapBoxUpdateRouteBuilder.java @@ -19,8 +19,8 @@ import com.google.common.base.Strings; import org.apache.camel.Exchange; import org.apache.camel.LoggingLevel; +import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.dataformat.JsonLibrary; -import org.apache.camel.spring.SpringRouteBuilder; import org.apache.commons.io.FileUtils; import org.entur.asag.mapbox.model.MapBoxAwsCredentials; import org.entur.asag.mapbox.model.MapBoxUploadStatus; @@ -36,7 +36,7 @@ import static org.apache.commons.io.FileUtils.deleteDirectory; @Component -public class MapBoxUpdateRouteBuilder extends SpringRouteBuilder { +public class MapBoxUpdateRouteBuilder extends RouteBuilder { private static final String TIAMAT_EXPORT_GCP_PATH = "tiamat-export"; public static final String LOOP_COUNTER = "LoopCounter"; @@ -58,7 +58,7 @@ public class MapBoxUpdateRouteBuilder extends SpringRouteBuilder { @Value("${mapbox.download.directory:files/mapbox}") private String localWorkingDirectory; - @Value("${mapbox.api.url:https4://api.mapbox.com}") + @Value("${mapbox.api.url:https://api.mapbox.com}") private String mapboxApiUrl; @Value("${mapbox.tileset.file.name:}") @@ -113,7 +113,7 @@ public void configure() throws Exception { exchange.getIn().getHeader(FILE_NAME).toString()))) .marshal().json(JsonLibrary.Jackson) .log(LoggingLevel.INFO, "Upload: ${body}") - .setHeader(Exchange.HTTP_METHOD, constant(org.apache.camel.component.http4.HttpMethods.POST)) + .setHeader(Exchange.HTTP_METHOD, constant(org.apache.camel.component.http.HttpMethods.POST)) .setHeader(Exchange.CONTENT_TYPE, constant("application/json")) .to(mapboxApiUrl + "/uploads/v1/" + mapboxUser + "?access_token=" + mapboxAccessToken + "&throwExceptionOnFailure=false") .to("log:DEBUG?showBody=true&showHeaders=true") @@ -175,10 +175,10 @@ public void configure() throws Exception { from("direct:fetchMapboxUploadStatus") .setProperty("tilesetId", simple("${body.id}")) - .log("Checking status for tileset: ${property.tilesetId}") + .log("Checking status for tileset: ${exchangeProperty.tilesetId}") .setBody(simple("")) - .setHeader(Exchange.HTTP_METHOD, constant(org.apache.camel.component.http4.HttpMethods.GET)) - .toD(mapboxApiUrl + "/uploads/v1/" + mapboxUser + "/${property.tilesetId}?access_token=" + mapboxAccessToken) + .setHeader(Exchange.HTTP_METHOD, constant(org.apache.camel.component.http.HttpMethods.GET)) + .toD(mapboxApiUrl + "/uploads/v1/" + mapboxUser + "/${exchangeProperty.tilesetId}?access_token=" + mapboxAccessToken) .unmarshal().json(JsonLibrary.Jackson, MapBoxUploadStatus.class) .log("Received status ${body}") .routeId("fetch-mapbox-upload-status"); @@ -218,9 +218,9 @@ public void configure() throws Exception { .routeId("mapbox-transform-from-tiamat"); from("direct:cleanUpLocalDirectory") - .log(LoggingLevel.DEBUG, getClass().getName(), "Deleting local directory ${property." + Exchange.FILE_PARENT + "} ...") + .log(LoggingLevel.DEBUG, getClass().getName(), "Deleting local directory ${exchangeProperty." + Exchange.FILE_PARENT + "} ...") .process(e -> deleteDirectory(new File(e.getIn().getHeader(Exchange.FILE_PARENT, String.class)))) - .log(LoggingLevel.DEBUG, getClass().getName(), "Local directory ${property." + Exchange.FILE_PARENT + "} cleanup done.") + .log(LoggingLevel.DEBUG, getClass().getName(), "Local directory ${exchangeProperty." + Exchange.FILE_PARENT + "} cleanup done.") .routeId("cleanup-local-dir"); } } diff --git a/src/main/java/org/entur/asag/mapbox/mapper/ZoneToGeoJsonFeatureMapper.java b/src/main/java/org/entur/asag/mapbox/mapper/ZoneToGeoJsonFeatureMapper.java index 18201ff..3e0da3c 100644 --- a/src/main/java/org/entur/asag/mapbox/mapper/ZoneToGeoJsonFeatureMapper.java +++ b/src/main/java/org/entur/asag/mapbox/mapper/ZoneToGeoJsonFeatureMapper.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/entur/asag/netex/PublicationDeliveryHelper.java b/src/main/java/org/entur/asag/netex/PublicationDeliveryHelper.java index ec76cba..831f103 100644 --- a/src/main/java/org/entur/asag/netex/PublicationDeliveryHelper.java +++ b/src/main/java/org/entur/asag/netex/PublicationDeliveryHelper.java @@ -21,10 +21,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; + +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; @@ -38,7 +39,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static javax.xml.bind.JAXBContext.newInstance; +import static jakarta.xml.bind.JAXBContext.newInstance; /** * Common useful methods for resolving parts of NeTEx diff --git a/src/test/java/org/entur/asag/AsagRouteBuilderIntegrationTestBase.java b/src/test/java/org/entur/asag/AsagRouteBuilderIntegrationTestBase.java index 6901380..4c504b0 100644 --- a/src/test/java/org/entur/asag/AsagRouteBuilderIntegrationTestBase.java +++ b/src/test/java/org/entur/asag/AsagRouteBuilderIntegrationTestBase.java @@ -15,12 +15,11 @@ package org.entur.asag; -import org.apache.camel.builder.AdviceWithRouteBuilder; -import org.apache.camel.model.ModelCamelContext; -import org.apache.camel.test.spring.CamelSpringRunner; -import org.apache.camel.test.spring.UseAdviceWith; -import org.junit.Before; -import org.junit.runner.RunWith; +import org.apache.camel.CamelContext; +import org.apache.camel.builder.AdviceWith; +import org.apache.camel.test.spring.junit5.UseAdviceWith; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; @@ -28,25 +27,22 @@ import java.io.IOException; @ActiveProfiles("test") -@RunWith(CamelSpringRunner.class) +@CamelSpringBootTest @UseAdviceWith @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) public class AsagRouteBuilderIntegrationTestBase { @Autowired - protected ModelCamelContext context; + protected CamelContext context; - @Before + @BeforeEach public void setUp() throws IOException { } protected void replaceEndpoint(String routeId,String originalEndpoint,String replacementEndpoint) throws Exception { - context.getRouteDefinition(routeId).adviceWith(context, new AdviceWithRouteBuilder() { - @Override - public void configure() throws Exception { - interceptSendToEndpoint(originalEndpoint) - .skipSendToOriginalEndpoint().to(replacementEndpoint); - } - }); + + AdviceWith.adviceWith(context, routeId, a -> + a.interceptSendToEndpoint(originalEndpoint) + .skipSendToOriginalEndpoint().to(replacementEndpoint)); } } diff --git a/src/test/java/org/entur/asag/MapBoxUpdateRouteBuilderTest.java b/src/test/java/org/entur/asag/MapBoxUpdateRouteBuilderTest.java index 2d846fc..79664ad 100644 --- a/src/test/java/org/entur/asag/MapBoxUpdateRouteBuilderTest.java +++ b/src/test/java/org/entur/asag/MapBoxUpdateRouteBuilderTest.java @@ -16,16 +16,15 @@ package org.entur.asag; +import org.apache.camel.CamelContext; import org.apache.camel.Exchange; -import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; -import org.apache.camel.model.ModelCamelContext; import org.entur.asag.mapbox.MapBoxUpdateRouteBuilder; import org.entur.asag.service.BlobStoreService; import org.entur.asag.service.UploadStatusHubotReporter; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.context.SpringBootTest; @@ -44,7 +43,7 @@ @SpringBootTest(classes = MapBoxUpdateRouteBuilder.class, properties = { "spring.main.sources=org.entur.asag", - "mapbox.api.url=http4://localhost:${wiremock.server.port}", + "mapbox.api.url=http://localhost:${wiremock.server.port}", "mapbox.upload.status.poll.delay=0", "blobstore.gcs.container.name=container", "blobstore.gcs.credential.path=credpath", @@ -73,12 +72,12 @@ public class MapBoxUpdateRouteBuilderTest extends AsagRouteBuilderIntegrationTes " \"secretAccessKey\": \"secretAKey\", \"sessionToken\": \"sestoken\", \"url\": \"http://localhost:0000\" }"; @Autowired - private ModelCamelContext context; + private CamelContext context; @Value("${tiamat.export.blobstore.subdirectory:tiamat/geocoder}") private String blobStoreSubdirectoryForTiamatGeoCoderExport; - @Produce(uri = "direct:uploadTiamatToMapboxAsGeoJson") + @Autowired protected ProducerTemplate producerTemplate; @Autowired @@ -90,7 +89,7 @@ public class MapBoxUpdateRouteBuilderTest extends AsagRouteBuilderIntegrationTes @Value("${wiremock.server.port}") private int wiremockServerPort; - @Before + @BeforeEach public void before() throws Exception { System.out.println("Wiremock port is: " + +wiremockServerPort); diff --git a/src/test/java/org/entur/asag/mapbox/mapper/DeliveryPublicationStreamToGeoJsonTest.java b/src/test/java/org/entur/asag/mapbox/mapper/DeliveryPublicationStreamToGeoJsonTest.java index 22b2229..1bc29b1 100644 --- a/src/test/java/org/entur/asag/mapbox/mapper/DeliveryPublicationStreamToGeoJsonTest.java +++ b/src/test/java/org/entur/asag/mapbox/mapper/DeliveryPublicationStreamToGeoJsonTest.java @@ -20,11 +20,11 @@ import org.entur.asag.mapbox.filter.ValidityFilter; import org.geojson.Feature; import org.geojson.FeatureCollection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.rutebanken.netex.validation.NeTExValidator; import org.xml.sax.SAXException; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.transform.stream.StreamSource; import java.io.ByteArrayOutputStream; import java.io.FileInputStream; diff --git a/src/test/java/org/entur/asag/mapbox/mapper/ParkingToGeoJsonFeatureMapperTest.java b/src/test/java/org/entur/asag/mapbox/mapper/ParkingToGeoJsonFeatureMapperTest.java index 5e1596d..1bbb0a2 100644 --- a/src/test/java/org/entur/asag/mapbox/mapper/ParkingToGeoJsonFeatureMapperTest.java +++ b/src/test/java/org/entur/asag/mapbox/mapper/ParkingToGeoJsonFeatureMapperTest.java @@ -16,7 +16,7 @@ package org.entur.asag.mapbox.mapper; import org.geojson.Feature; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.rutebanken.netex.model.CoveredEnumeration; import org.rutebanken.netex.model.Parking; import org.rutebanken.netex.model.ParkingVehicleEnumeration; diff --git a/src/test/java/org/entur/asag/mapbox/mapper/QuayToGeoJsonFeatureMapperTest.java b/src/test/java/org/entur/asag/mapbox/mapper/QuayToGeoJsonFeatureMapperTest.java index 296dfe4..75950f5 100644 --- a/src/test/java/org/entur/asag/mapbox/mapper/QuayToGeoJsonFeatureMapperTest.java +++ b/src/test/java/org/entur/asag/mapbox/mapper/QuayToGeoJsonFeatureMapperTest.java @@ -16,7 +16,7 @@ package org.entur.asag.mapbox.mapper; import org.geojson.Feature; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.rutebanken.netex.model.Quay; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; diff --git a/src/test/java/org/entur/asag/mapbox/mapper/StopPlaceToGeoJsonFeatureMapperTest.java b/src/test/java/org/entur/asag/mapbox/mapper/StopPlaceToGeoJsonFeatureMapperTest.java index 35350ab..37ec4ac 100644 --- a/src/test/java/org/entur/asag/mapbox/mapper/StopPlaceToGeoJsonFeatureMapperTest.java +++ b/src/test/java/org/entur/asag/mapbox/mapper/StopPlaceToGeoJsonFeatureMapperTest.java @@ -17,7 +17,7 @@ import org.entur.asag.netex.PublicationDeliveryHelper; import org.geojson.Feature; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.rutebanken.netex.model.AirSubmodeEnumeration; import org.rutebanken.netex.model.EntityStructure; import org.rutebanken.netex.model.InterchangeWeightingEnumeration; diff --git a/src/test/java/org/entur/asag/mapbox/mapper/ZoneToGeoJsonFeatureMapperTest.java b/src/test/java/org/entur/asag/mapbox/mapper/ZoneToGeoJsonFeatureMapperTest.java index 6a184f9..13b460f 100644 --- a/src/test/java/org/entur/asag/mapbox/mapper/ZoneToGeoJsonFeatureMapperTest.java +++ b/src/test/java/org/entur/asag/mapbox/mapper/ZoneToGeoJsonFeatureMapperTest.java @@ -22,7 +22,7 @@ import org.geojson.Feature; import org.geojson.Point; import org.geojson.Polygon; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.rutebanken.netex.model.*; import java.math.BigDecimal;