Skip to content

Make TDHttpRequestHandler FunctionalInterface #219

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
xerial merged 1 commit into from
Jan 26, 2023
Merged

Make TDHttpRequestHandler FunctionalInterface #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/main/java/com/treasuredata/client/TDHttpRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/**
*
*/
@FunctionalInterface
public interface TDHttpRequestHandler<Result>
{
static class ResponseContext
Expand Down
33 changes: 5 additions & 28 deletions src/main/java/com/treasuredata/client/TDHttpRequestHandlers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.treasuredata.client;

import com.google.common.base.Function;
import okhttp3.Response;
import okhttp3.ResponseBody;

import java.io.InputStream;
Expand All @@ -15,37 +14,15 @@ private TDHttpRequestHandlers()
{
}

public static final TDHttpRequestHandler<String> stringContentHandler = new TDHttpRequestHandler<String>()
{
@Override
public String onSuccess(Response response)
throws Exception
{
return response.body().string();
}
};
public static final TDHttpRequestHandler<String> stringContentHandler = response -> response.body().string();

public static final TDHttpRequestHandler<byte[]> byteArrayContentHandler = new TDHttpRequestHandler<byte[]>()
{
@Override
public byte[] onSuccess(Response response)
throws Exception
{
return response.body().bytes();
}
};
public static final TDHttpRequestHandler<byte[]> byteArrayContentHandler = response -> response.body().bytes();

public static final <Result> TDHttpRequestHandler<Result> newByteStreamHandler(final Function<InputStream, Result> handler)
{
return new TDHttpRequestHandler<Result>()
{
@Override
public Result onSuccess(Response response)
throws Exception
{
try (ResponseBody body = response.body()) {
return handler.apply(body.byteStream());
}
return response -> {
try (ResponseBody body = response.body()) {
return handler.apply(body.byteStream());
}
};
}
Expand Down