Merge pull request #437 from nramc/431-feature-switch-geojson-library-from-commons-to-geojson4j

feat: legacy geojson library replaced with geojson4j

Author: nramc

pom.xml

@@ -30,7 +30,6 @@
         <rewrite-maven-plugin.skip.dry-run-execution>false</rewrite-maven-plugin.skip.dry-run-execution>
 
         <!--    mvn versions:display-property-updates    -->
-        <commons-geojson.version>0.0.38</commons-geojson.version>
         <geojson4j.version>1.0.1</geojson4j.version>
         <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
         <rewrite-java-security.version>2.17.1</rewrite-java-security.version>
@@ -103,11 +102,6 @@
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.github.nramc.commons</groupId>
-            <artifactId>commons-geojson</artifactId>
-            <version>${commons-geojson.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.github.nramc</groupId>
             <artifactId>geojson4j</artifactId>

src/main/java/com/github/nramc/dev/journey/api/core/journey/JourneyGeoDetails.java

@@ -1,7 +1,7 @@
 package com.github.nramc.dev.journey.api.core.journey;
 
-import com.github.nramc.commons.geojson.domain.GeoJson;
-import com.github.nramc.commons.geojson.domain.Geometry;
+import com.github.nramc.geojson.domain.GeoJson;
+import com.github.nramc.geojson.domain.Geometry;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Builder;

src/main/java/com/github/nramc/dev/journey/api/repository/converters/JacksonBasedReadGeoJsonConverter.java

@@ -1,7 +1,7 @@
 package com.github.nramc.dev.journey.api.repository.converters;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.nramc.commons.geojson.domain.GeoJson;
+import com.github.nramc.geojson.domain.GeoJson;
 import org.bson.Document;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.lang.NonNull;

src/main/java/com/github/nramc/dev/journey/api/repository/converters/JacksonBasedReadGeometryConverter.java

@@ -1,7 +1,7 @@
 package com.github.nramc.dev.journey.api.repository.converters;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.nramc.commons.geojson.domain.Geometry;
+import com.github.nramc.geojson.domain.Geometry;
 import org.bson.Document;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.lang.NonNull;

src/main/java/com/github/nramc/dev/journey/api/repository/converters/JacksonBasedWriteGeoJsonConverter.java

@@ -1,7 +1,7 @@
 package com.github.nramc.dev.journey.api.repository.converters;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.nramc.commons.geojson.domain.GeoJson;
+import com.github.nramc.geojson.domain.GeoJson;
 import org.bson.Document;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.lang.NonNull;

src/main/java/com/github/nramc/dev/journey/api/repository/converters/JacksonBasedWriteGeometryConverter.java

@@ -1,7 +1,7 @@
 package com.github.nramc.dev.journey.api.repository.converters;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.nramc.commons.geojson.domain.Geometry;
+import com.github.nramc.geojson.domain.Geometry;
 import org.bson.Document;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.lang.NonNull;

src/main/java/com/github/nramc/dev/journey/api/repository/journey/JourneyGeoDetailsEntity.java

@@ -1,7 +1,7 @@
 package com.github.nramc.dev.journey.api.repository.journey;
 
-import com.github.nramc.commons.geojson.domain.GeoJson;
-import com.github.nramc.commons.geojson.domain.Geometry;
+import com.github.nramc.geojson.domain.GeoJson;
+import com.github.nramc.geojson.domain.Geometry;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/github/nramc/dev/journey/api/repository/journey/converter/JourneyFeatureConverter.java

@@ -1,8 +1,8 @@
 package com.github.nramc.dev.journey.api.repository.journey.converter;
 
-import com.github.nramc.commons.geojson.domain.Feature;
 import com.github.nramc.dev.journey.api.repository.journey.JourneyEntity;
 import com.github.nramc.dev.journey.api.repository.journey.JourneyGeoDetailsEntity;
+import com.github.nramc.geojson.domain.Feature;
 import lombok.experimental.UtilityClass;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/find/FindPublishedJourneyResource.java

@@ -1,12 +1,12 @@
 package com.github.nramc.dev.journey.api.web.resources.rest.journeys.find;
 
-import com.github.nramc.commons.geojson.domain.Feature;
-import com.github.nramc.commons.geojson.domain.FeatureCollection;
-import com.github.nramc.commons.geojson.domain.GeoJson;
 import com.github.nramc.dev.journey.api.repository.journey.JourneyEntity;
 import com.github.nramc.dev.journey.api.repository.journey.JourneyRepository;
 import com.github.nramc.dev.journey.api.core.journey.security.JourneyAuthorizationManager;
 import com.github.nramc.dev.journey.api.repository.journey.converter.JourneyFeatureConverter;
+import com.github.nramc.geojson.domain.Feature;
+import com.github.nramc.geojson.domain.FeatureCollection;
+import com.github.nramc.geojson.domain.GeoJson;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/geo/UpdateJourneyGeoDetailsRequest.java

@@ -1,7 +1,7 @@
 package com.github.nramc.dev.journey.api.web.resources.rest.journeys.update.geo;
 
-import com.github.nramc.commons.geojson.domain.GeoJson;
-import com.github.nramc.commons.geojson.domain.Geometry;
+import com.github.nramc.geojson.domain.GeoJson;
+import com.github.nramc.geojson.domain.Geometry;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 

src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/JourneyData.java

@@ -1,9 +1,5 @@
 package com.github.nramc.dev.journey.api.web.resources.rest.journeys;
 
-import com.github.nramc.commons.geojson.domain.Feature;
-import com.github.nramc.commons.geojson.domain.FeatureCollection;
-import com.github.nramc.commons.geojson.domain.Point;
-import com.github.nramc.commons.geojson.domain.Position;
 import com.github.nramc.dev.journey.api.config.security.WithMockAuthenticatedUser;
 import com.github.nramc.dev.journey.api.core.journey.security.Visibility;
 import com.github.nramc.dev.journey.api.repository.journey.JourneyEntity;
@@ -12,6 +8,10 @@
 import com.github.nramc.dev.journey.api.repository.journey.JourneyImagesDetailsEntity;
 import com.github.nramc.dev.journey.api.repository.journey.JourneyVideoDetailEntity;
 import com.github.nramc.dev.journey.api.repository.journey.JourneyVideosDetailsEntity;
+import com.github.nramc.geojson.domain.Feature;
+import com.github.nramc.geojson.domain.FeatureCollection;
+import com.github.nramc.geojson.domain.Point;
+import com.github.nramc.geojson.domain.Position;
 import lombok.experimental.UtilityClass;
 
 import java.time.LocalDate;