Move servlet adapters to an internal package to avoid duplicating classes when building OSGi bundles (#789)

* Move servlet adapters to an internal package to avoid duplicating classes when building OSGi bundles

Signed-off-by: Antoine DESSAIGNE <antoine.dessaigne@gmail.com>

* Fix typo in Adapter preventing it to work properly

Signed-off-by: Antoine DESSAIGNE <antoine.dessaigne@gmail.com>

Author: adessaigne

simpleclient_servlet/src/main/java/io/prometheus/client/exporter/MetricsServlet.java

@@ -1,6 +1,6 @@
 package io.prometheus.client.exporter;
 
-import io.prometheus.client.Adapter;
+import io.prometheus.client.internal.Adapter;
 import io.prometheus.client.CollectorRegistry;
 import io.prometheus.client.Predicate;
 import io.prometheus.client.servlet.common.exporter.Exporter;
@@ -13,7 +13,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-import static io.prometheus.client.Adapter.wrap;
+import static io.prometheus.client.internal.Adapter.wrap;
 
 /**
  * The MetricsServlet class provides a simple way of exposing the metrics values.

simpleclient_servlet/src/main/java/io/prometheus/client/filter/MetricsFilter.java

@@ -1,6 +1,6 @@
 package io.prometheus.client.filter;
 
-import io.prometheus.client.Adapter;
+import io.prometheus.client.internal.Adapter;
 import io.prometheus.client.servlet.common.filter.Filter;
 import io.prometheus.client.servlet.common.filter.FilterConfigurationException;
 

simpleclient_servlet/src/main/java/io/prometheus/client/Adapter.java renamed to simpleclient_servlet/src/main/java/io/prometheus/client/internal/Adapter.java

@@ -1,4 +1,4 @@
-package io.prometheus.client;
+package io.prometheus.client.internal;
 
 import io.prometheus.client.servlet.common.adapter.FilterConfigAdapter;
 import io.prometheus.client.servlet.common.adapter.HttpServletRequestAdapter;
@@ -58,7 +58,7 @@ private static class HttpServletResponseAdapterImpl implements HttpServletRespon
 
         @Override
         public void setStatus(int httpStatusCode) {
-            delegate.setBufferSize(httpStatusCode);
+            delegate.setStatus(httpStatusCode);
         }
 
         @Override