Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/main/java/io/github/odunlamizo/jsonbin/JsonBin.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ public interface JsonBin {
* strongly-typed {@link Bin} object containing the expected data type {@code T}.
*
* @param binId the unique identifier of the bin to retrieve; must not be {@code null}
* @param recordClass the class of the expected record type {@code T} used for deserialization;
* must not be {@code null}
* @param cls the class of the expected record type {@code T} used for deserialization; must not
* be {@code null}
* @return a {@link Bin} object containing the deserialized data
*/
<T> Bin<T> readBin(@NonNull String binId, @NonNull Class<T> recordClass);
<T> Bin<T> readBin(@NonNull String binId, @NonNull Class<T> cls);

/**
* Creates a new bin with the provided record.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.github.odunlamizo.jsonbin.okhttp;

import java.io.IOException;
import lombok.NonNull;
import okhttp3.Interceptor;
import okhttp3.Request;
import okhttp3.Response;
Expand All @@ -16,6 +17,7 @@ public AuthInterceptor(String masterKey, String accessKey) {
this.accessKey = accessKey;
}

@NonNull
@Override
public Response intercept(Chain chain) throws IOException {
Request original = chain.request();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ public JsonBinOkHttp build() {
}

@Override
public <T> Bin<T> readBin(@NonNull String binId, @NonNull Class<T> recordClass) {
public <T> Bin<T> readBin(@NonNull String binId, @NonNull Class<T> cls) {
String url = String.format("%s/b/%s", baseUrl, binId);
Request request = new Request.Builder().url(url).build();

return newCall(request, binTypeRef(recordClass));
return newCall(request, getTypeRef(cls));
}

@Override
Expand Down Expand Up @@ -100,10 +100,7 @@ public <T> Bin<T> createBin(T record, String binName, Boolean isPrivate, String

Request request = requestBuilder.build();

@SuppressWarnings("unchecked")
Class<T> recordClass = (Class<T>) record.getClass();

return newCall(request, binTypeRef(recordClass));
return newCall(request, getTypeRef(getClass(record)));
}

@Override
Expand All @@ -121,10 +118,7 @@ public <T> Bin<T> updateBin(@NonNull T record, @NonNull String binId) {

Request request = new Request.Builder().url(url).put(body).build();

@SuppressWarnings("unchecked")
Class<T> recordClass = (Class<T>) record.getClass();

return newCall(request, binTypeRef(recordClass));
return newCall(request, getTypeRef(getClass(record)));
}

@Override
Expand Down Expand Up @@ -185,13 +179,17 @@ private <T> T newCall(Request request, TypeReference<T> ref) {
}
}

private <T> TypeReference<Bin<T>> binTypeRef(Class<T> recordClass) {
private <T> TypeReference<Bin<T>> getTypeRef(Class<T> cls) {
return new TypeReference<>() {
@Override
public java.lang.reflect.Type getType() {
return TypeFactory.defaultInstance()
.constructParametricType(Bin.class, recordClass);
return TypeFactory.defaultInstance().constructParametricType(Bin.class, cls);
}
};
}

@SuppressWarnings("unchecked")
private <T> Class<T> getClass(T object) {
return (Class<T>) object.getClass();
}
}