Skip to content

Request body must be null on get for okhttp, empty body does not work… #70

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
LMWF merged 2 commits into from
Jan 7, 2020
Merged

Request body must be null on get for okhttp, empty body does not work… #70

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
a53501a
Request body must be null on get for okhttp, empty body does not work…
Jan 7, 2020
d7c0bca
Make ctor package private and use equals for string compare
Jan 7, 2020
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
10 changes: 5 additions & 5 deletions sdk/src/main/java/io/dapr/actors/runtime/AbstractActor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ public abstract class AbstractActor {
*/
private final ActorId id;

/**
* Manager for the states in Actors.
*/
private final ActorStateManager actorStateManager;

/**
* Emits trace messages for Actors.
*/
Expand All @@ -53,6 +48,11 @@ public abstract class AbstractActor {
*/
private final Map<String, ActorTimer> timers;

/**
* Manager for the states in Actors.
*/
protected final ActorStateManager actorStateManager;

/**
* Instantiates a new Actor.
*
Expand Down
16 changes: 8 additions & 8 deletions sdk/src/main/java/io/dapr/actors/runtime/ActorStateManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* <p>
* All changes are cached in-memory until save() is called.
*/
class ActorStateManager {
public class ActorStateManager {

/**
* Provides states using a state store.
Expand Down Expand Up @@ -59,7 +59,7 @@ class ActorStateManager {
* @param <T> Type of the object being added.
* @return Asynchronous void operation.
*/
<T> Mono<Void> add(String stateName, T value) {
public <T> Mono<Void> add(String stateName, T value) {
try {
if (stateName == null) {
throw new IllegalArgumentException("State's name cannot be null.");
Expand Down Expand Up @@ -98,7 +98,7 @@ <T> Mono<Void> add(String stateName, T value) {
* @param <T> Type being fetched.
* @return Asynchronous response with fetched object.
*/
<T> Mono<T> get(String stateName, Class<T> clazz) {
public <T> Mono<T> get(String stateName, Class<T> clazz) {
try {
if (stateName == null) {
throw new IllegalArgumentException("State's name cannot be null.");
Expand Down Expand Up @@ -133,7 +133,7 @@ <T> Mono<T> get(String stateName, Class<T> clazz) {
* @param <T> Type of the value being set.
* @return Asynchronous void result.
*/
<T> Mono<Void> set(String stateName, T value) {
public <T> Mono<Void> set(String stateName, T value) {
try {
if (stateName == null) {
throw new IllegalArgumentException("State's name cannot be null.");
Expand Down Expand Up @@ -169,7 +169,7 @@ <T> Mono<Void> set(String stateName, T value) {
* @param stateName State being stored.
* @return Asynchronous void result.
*/
Mono<Void> remove(String stateName) {
public Mono<Void> remove(String stateName) {
try {
if (stateName == null) {
throw new IllegalArgumentException("State's name cannot be null.");
Expand Down Expand Up @@ -209,7 +209,7 @@ Mono<Void> remove(String stateName) {
* @param stateName State being checked.
* @return Asynchronous boolean result indicating whether state is present.
*/
Mono<Boolean> contains(String stateName) {
public Mono<Boolean> contains(String stateName) {
try {
if (stateName == null) {
throw new IllegalArgumentException("State's name cannot be null.");
Expand All @@ -236,7 +236,7 @@ Mono<Boolean> contains(String stateName) {
*
* @return Asynchronous void result.
*/
Mono<Void> save() {
public Mono<Void> save() {
if (this.stateChangeTracker.isEmpty()) {
return Mono.empty();
}
Expand Down Expand Up @@ -264,7 +264,7 @@ Mono<Void> save() {
*
* @return
*/
Mono<Void> clear() {
public Mono<Void> clear() {
this.stateChangeTracker.clear();
return Mono.empty();
}
Expand Down
2 changes: 1 addition & 1 deletion sdk/src/main/java/io/dapr/client/AbstractDaprHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public final Mono<String> invokeAPI(String method, String urlString, String json

Request request = new Request.Builder()
.url(new URL(this.baseUrl + urlString))
.method(method, body)
.method(method, (json == null && method.equals("GET")) ? null : body)
.addHeader(Constants.HEADER_DAPR_REQUEST_ID, requestId)
.build();

Expand Down