From 02e39618fc03a0f6d928dbd53b8852741ba27bb5 Mon Sep 17 00:00:00 2001 From: Andreas Zahnen Date: Sun, 13 Aug 2023 11:17:17 +0200 Subject: [PATCH 1/3] adjust to dropwizard 3 --- .../de/ii/ogcapi/common/app/html/OgcApiErrorView.java | 2 +- .../features/html/domain/FeatureEncoderHtml.java | 2 +- .../ii/ogcapi/features/html/domain/FeaturesView.java | 11 ++++++----- .../ogcapi/foundation/domain/ApiCatalogProvider.java | 2 +- .../foundation/domain/DefaultLinksGenerator.java | 2 +- .../de/ii/ogcapi/foundation/domain/URICustomizer.java | 4 ++-- .../java/de/ii/ogcapi/html/domain/DatasetView.java | 4 ++-- .../java/de/ii/ogcapi/html/domain/OgcApiView.java | 2 +- .../de/ii/ogcapi/tiles/app/PurgeTileCacheTask.java | 2 +- 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ogcapi-stable/ogcapi-common/src/main/java/de/ii/ogcapi/common/app/html/OgcApiErrorView.java b/ogcapi-stable/ogcapi-common/src/main/java/de/ii/ogcapi/common/app/html/OgcApiErrorView.java index 8b1c49fade..b340a7e5a0 100644 --- a/ogcapi-stable/ogcapi-common/src/main/java/de/ii/ogcapi/common/app/html/OgcApiErrorView.java +++ b/ogcapi-stable/ogcapi-common/src/main/java/de/ii/ogcapi/common/app/html/OgcApiErrorView.java @@ -9,7 +9,7 @@ import com.google.common.base.Charsets; import de.ii.ogcapi.foundation.domain.ApiErrorMessage; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; public class OgcApiErrorView extends View { diff --git a/ogcapi-stable/ogcapi-features-html/src/main/java/de/ii/ogcapi/features/html/domain/FeatureEncoderHtml.java b/ogcapi-stable/ogcapi-features-html/src/main/java/de/ii/ogcapi/features/html/domain/FeatureEncoderHtml.java index 57ad28415f..8b67ab5495 100644 --- a/ogcapi-stable/ogcapi-features-html/src/main/java/de/ii/ogcapi/features/html/domain/FeatureEncoderHtml.java +++ b/ogcapi-stable/ogcapi-features-html/src/main/java/de/ii/ogcapi/features/html/domain/FeatureEncoderHtml.java @@ -21,7 +21,7 @@ import de.ii.xtraplatform.streams.domain.OutputStreamToByteConsumer; import de.ii.xtraplatform.strings.domain.StringTemplateFilters; import de.ii.xtraplatform.web.domain.MustacheRenderer; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; import java.io.IOException; import java.io.OutputStreamWriter; import java.util.List; diff --git a/ogcapi-stable/ogcapi-features-html/src/main/java/de/ii/ogcapi/features/html/domain/FeaturesView.java b/ogcapi-stable/ogcapi-features-html/src/main/java/de/ii/ogcapi/features/html/domain/FeaturesView.java index ab95bc0480..56325562ff 100644 --- a/ogcapi-stable/ogcapi-features-html/src/main/java/de/ii/ogcapi/features/html/domain/FeaturesView.java +++ b/ogcapi-stable/ogcapi-features-html/src/main/java/de/ii/ogcapi/features/html/domain/FeaturesView.java @@ -41,9 +41,8 @@ import java.util.function.Function; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.apache.http.Consts; -import org.apache.http.NameValuePair; -import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.hc.core5.http.NameValuePair; +import org.apache.hc.core5.net.URLEncodedUtils; import org.immutables.value.Value; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -337,11 +336,13 @@ public Function getQueryWithout() { List ignore = Splitter.on(',').trimResults().omitEmptyStrings().splitToList(without); List query = - URLEncodedUtils.parse(RawQuery().substring(1), Consts.ISO_8859_1).stream() + URLEncodedUtils.parse(RawQuery().substring(1), StandardCharsets.ISO_8859_1).stream() .filter(kvp -> !ignore.contains(kvp.getName().toLowerCase())) .collect(Collectors.toList()); - return '?' + URLEncodedUtils.format(query, '&', Consts.UTF_8) + (!query.isEmpty() ? '&' : ""); + return '?' + + URLEncodedUtils.format(query, '&', StandardCharsets.UTF_8) + + (!query.isEmpty() ? '&' : ""); }; } diff --git a/ogcapi-stable/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/ApiCatalogProvider.java b/ogcapi-stable/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/ApiCatalogProvider.java index 57756b22a2..ece2f0160a 100644 --- a/ogcapi-stable/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/ApiCatalogProvider.java +++ b/ogcapi-stable/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/ApiCatalogProvider.java @@ -25,7 +25,7 @@ import java.util.Optional; import java.util.stream.Collectors; import javax.ws.rs.core.Response; -import org.apache.http.NameValuePair; +import org.apache.hc.core5.http.NameValuePair; public abstract class ApiCatalogProvider implements ServiceListingProvider, ApiExtension { diff --git a/ogcapi-stable/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/DefaultLinksGenerator.java b/ogcapi-stable/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/DefaultLinksGenerator.java index 7d76802ed1..aca275fbcc 100644 --- a/ogcapi-stable/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/DefaultLinksGenerator.java +++ b/ogcapi-stable/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/DefaultLinksGenerator.java @@ -13,7 +13,7 @@ import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.http.client.utils.URIBuilder; +import org.apache.hc.core5.net.URIBuilder; public class DefaultLinksGenerator { diff --git a/ogcapi-stable/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/URICustomizer.java b/ogcapi-stable/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/URICustomizer.java index 84d6dfb8ba..569274e820 100644 --- a/ogcapi-stable/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/URICustomizer.java +++ b/ogcapi-stable/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/URICustomizer.java @@ -14,8 +14,8 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import org.apache.http.NameValuePair; -import org.apache.http.client.utils.URIBuilder; +import org.apache.hc.core5.http.NameValuePair; +import org.apache.hc.core5.net.URIBuilder; /** * @author zahnen diff --git a/ogcapi-stable/ogcapi-html/src/main/java/de/ii/ogcapi/html/domain/DatasetView.java b/ogcapi-stable/ogcapi-html/src/main/java/de/ii/ogcapi/html/domain/DatasetView.java index e78fa2984b..6b22bac752 100644 --- a/ogcapi-stable/ogcapi-html/src/main/java/de/ii/ogcapi/html/domain/DatasetView.java +++ b/ogcapi-stable/ogcapi-html/src/main/java/de/ii/ogcapi/html/domain/DatasetView.java @@ -17,8 +17,8 @@ import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.http.NameValuePair; -import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.hc.core5.http.NameValuePair; +import org.apache.hc.core5.net.URLEncodedUtils; /** * @author zahnen diff --git a/ogcapi-stable/ogcapi-html/src/main/java/de/ii/ogcapi/html/domain/OgcApiView.java b/ogcapi-stable/ogcapi-html/src/main/java/de/ii/ogcapi/html/domain/OgcApiView.java index 19f3a32abb..abce33e5c5 100644 --- a/ogcapi-stable/ogcapi-html/src/main/java/de/ii/ogcapi/html/domain/OgcApiView.java +++ b/ogcapi-stable/ogcapi-html/src/main/java/de/ii/ogcapi/html/domain/OgcApiView.java @@ -11,7 +11,7 @@ import com.google.common.collect.ImmutableList; import de.ii.ogcapi.foundation.domain.Link; import de.ii.ogcapi.foundation.domain.OgcApiDataV2; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; import java.util.Comparator; import java.util.List; import java.util.Objects; diff --git a/ogcapi-stable/ogcapi-tiles/src/main/java/de/ii/ogcapi/tiles/app/PurgeTileCacheTask.java b/ogcapi-stable/ogcapi-tiles/src/main/java/de/ii/ogcapi/tiles/app/PurgeTileCacheTask.java index 412823f0a2..812def8b82 100644 --- a/ogcapi-stable/ogcapi-tiles/src/main/java/de/ii/ogcapi/tiles/app/PurgeTileCacheTask.java +++ b/ogcapi-stable/ogcapi-tiles/src/main/java/de/ii/ogcapi/tiles/app/PurgeTileCacheTask.java @@ -18,8 +18,8 @@ import de.ii.xtraplatform.store.domain.entities.EntityRegistry; import de.ii.xtraplatform.tiles.domain.TileMatrixSetRepository; import de.ii.xtraplatform.web.domain.DropwizardPlugin; +import io.dropwizard.core.setup.Environment; import io.dropwizard.servlets.tasks.Task; -import io.dropwizard.setup.Environment; import java.io.PrintWriter; import java.util.Collection; import java.util.List; From 9dcf31a11ade68ca2e5062ce190579b1250a3da0 Mon Sep 17 00:00:00 2001 From: Andreas Zahnen Date: Sun, 13 Aug 2023 11:17:38 +0200 Subject: [PATCH 2/3] upgrade xtraplatform --- xtraplatform.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xtraplatform.gradle b/xtraplatform.gradle index 7ce58db23b..c85943149e 100644 --- a/xtraplatform.gradle +++ b/xtraplatform.gradle @@ -1,7 +1,7 @@ dependencies { - layers group: 'de.interactive_instruments', name: 'xtraplatform-core', version: '5.3.0-SNAPSHOT' + layers group: 'de.interactive_instruments', name: 'xtraplatform-core', version: '5.3.0-dropwizard3-SNAPSHOT' layers group: 'de.interactive_instruments', name: 'xtraplatform-native', version: "2.2.0-${platform}" - layers group: 'de.interactive_instruments', name: 'xtraplatform-spatial', version: '6.3.0-SNAPSHOT' + layers group: 'de.interactive_instruments', name: 'xtraplatform-spatial', version: '6.3.0-dropwizard3-SNAPSHOT' } From 8611e94880051fd633d1cda50475ce3d3218993d Mon Sep 17 00:00:00 2001 From: Andreas Zahnen Date: Mon, 14 Aug 2023 18:58:49 +0200 Subject: [PATCH 3/3] upgrade xtraplatform --- xtraplatform.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xtraplatform.gradle b/xtraplatform.gradle index c85943149e..7ce58db23b 100644 --- a/xtraplatform.gradle +++ b/xtraplatform.gradle @@ -1,7 +1,7 @@ dependencies { - layers group: 'de.interactive_instruments', name: 'xtraplatform-core', version: '5.3.0-dropwizard3-SNAPSHOT' + layers group: 'de.interactive_instruments', name: 'xtraplatform-core', version: '5.3.0-SNAPSHOT' layers group: 'de.interactive_instruments', name: 'xtraplatform-native', version: "2.2.0-${platform}" - layers group: 'de.interactive_instruments', name: 'xtraplatform-spatial', version: '6.3.0-dropwizard3-SNAPSHOT' + layers group: 'de.interactive_instruments', name: 'xtraplatform-spatial', version: '6.3.0-SNAPSHOT' }