Dropwizard3 (#1040)

interactive-instruments · Aug 14, 2023 · 1e72997 · 1e72997
1 parent 43b0f7d
commit 1e72997
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 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
@@ -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/...api-features-html/src/main/java/de/ii/ogcapi/features/html/domain/FeatureEncoderHtml.java b/...api-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/...le/ogcapi-features-html/src/main/java/de/ii/ogcapi/features/html/domain/FeaturesView.java b/...le/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<String, String> getQueryWithout() {
       List<String> ignore = Splitter.on(',').trimResults().omitEmptyStrings().splitToList(without);
 
       List<NameValuePair> 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/...le/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/ApiCatalogProvider.java b/...le/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-foundation/src/main/java/de/ii/ogcapi/foundation/domain/DefaultLinksGenerator.java b/...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/...-stable/ogcapi-foundation/src/main/java/de/ii/ogcapi/foundation/domain/URICustomizer.java b/...-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
@@ -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
@@ -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
@@ -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;