Update Gradle to version 5.3 - Now with retries (#8840)

This commit is contained in:
Mikael Mengistu 2019-03-27 10:04:25 -07:00 committed by GitHub
parent cb6fb32529
commit e979426809
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 12 deletions

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

View File

@ -11,10 +11,11 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import com.google.gson.stream.JsonReader;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.google.gson.stream.JsonReader;
import io.reactivex.Completable; import io.reactivex.Completable;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.Single; import io.reactivex.Single;
@ -543,7 +544,7 @@ public class HubConnection {
Object[] checkUploadStream(Object[] args, List<String> streamIds) { Object[] checkUploadStream(Object[] args, List<String> streamIds) {
List<Object> params = new ArrayList<>(Arrays.asList(args)); List<Object> params = new ArrayList<>(Arrays.asList(args));
for (Object arg: args) { for (Object arg: args) {
if(arg instanceof Observable) { if (arg instanceof Observable) {
params.remove(arg); params.remove(arg);
Observable stream = (Observable)arg; Observable stream = (Observable)arg;
String streamId = connectionState.getNextInvocationId(); String streamId = connectionState.getNextInvocationId();

View File

@ -20,7 +20,7 @@ class InvocationMessage extends HubMessage {
this.invocationId = invocationId; this.invocationId = invocationId;
this.target = target; this.target = target;
this.arguments = args; this.arguments = args;
if(streamIds != null && !streamIds.isEmpty()) { if (streamIds != null && !streamIds.isEmpty()) {
this.streamIds = streamIds; this.streamIds = streamIds;
} }
} }

View File

@ -4,7 +4,6 @@
package com.microsoft.signalr; package com.microsoft.signalr;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@ -103,7 +102,7 @@ class NegotiateResponse {
return error; return error;
} }
public String getFinalUrl(){ public String getFinalUrl() {
return finalUrl; return finalUrl;
} }

View File

@ -14,15 +14,14 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import io.reactivex.subjects.CompletableSubject;
import io.reactivex.subjects.PublishSubject;
import io.reactivex.subjects.ReplaySubject;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.Single; import io.reactivex.Single;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import io.reactivex.subjects.CompletableSubject;
import io.reactivex.subjects.PublishSubject;
import io.reactivex.subjects.ReplaySubject;
import io.reactivex.subjects.SingleSubject; import io.reactivex.subjects.SingleSubject;
class HubConnectionTest { class HubConnectionTest {

View File

@ -5,10 +5,11 @@ package com.microsoft.signalr;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
import com.google.gson.stream.JsonReader; import java.io.StringReader;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.StringReader; import com.google.gson.stream.JsonReader;
class NegotiateResponseTest { class NegotiateResponseTest {