Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82a2246
Move servlet adapters to an internal package to avoid duplicating cla…
adessaigne Jun 1, 2022
f1a948f
Fix typo in Adapter preventing it to work properly
adessaigne Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions simpleclient_servlet/src/main/java/io/prometheus/client/exporter/MetricsServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion simpleclient_servlet/src/main/java/io/prometheus/client/filter/MetricsFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...in/java/io/prometheus/client/Adapter.java → ...o/prometheus/client/internal/Adapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -58,7 +58,7 @@ private static class HttpServletResponseAdapterImpl implements HttpServletRespon

@Override
public void setStatus(int httpStatusCode) {
delegate.setBufferSize(httpStatusCode);
delegate.setStatus(httpStatusCode);
}

@Override
Expand Down