Skip to content

Commit 4318d31

Browse files
committed
Update based on review comments
1 parent 45856ca commit 4318d31

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/common/HttpObservable.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.apache.http.auth.UsernamePasswordCredentials;
3535
import org.apache.http.client.CookieStore;
3636
import org.apache.http.client.CredentialsProvider;
37-
import org.apache.http.client.HttpResponseException;
3837
import org.apache.http.client.config.AuthSchemes;
3938
import org.apache.http.client.config.CookieSpecs;
4039
import org.apache.http.client.config.RequestConfig;
@@ -238,7 +237,7 @@ public static Observable<HttpResponse> toStringOnlyOkResponse(CloseableHttpRespo
238237

239238
if (status.getStatusCode() >= 300) {
240239
Header requestIdHeader = streamResp.getFirstHeader("x-ms-request-id");
241-
return Observable.error(new HttpResponseWithRequestIdException(status.getStatusCode(),
240+
return Observable.error(new SparkAzureDataLakePoolServiceException(status.getStatusCode(),
242241
status.getReasonPhrase(),
243242
requestIdHeader != null ? requestIdHeader.getValue() : ""));
244243
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424

2525
import com.microsoft.azuretools.azurecommons.helpers.Nullable;
2626

27-
public class HttpResponseWithRequestIdException extends AzureDataLakeException {
27+
public class SparkAzureDataLakePoolServiceException extends AzureDataLakeException {
2828
@Nullable
2929
private String requestId;
3030

31-
public HttpResponseWithRequestIdException(final int statusCode, final String s, @Nullable final String requestId) {
31+
public SparkAzureDataLakePoolServiceException(final int statusCode, final String s, @Nullable final String requestId) {
3232
super(statusCode, s);
3333
this.requestId = requestId;
3434
}

Utils/hdinsight-node-common/src/com/microsoft/azure/sparkserverless/serverexplore/SparkServerlessClusterProvisionCtrlProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.microsoft.azure.hdinsight.common.logger.ILogger;
2525
import com.microsoft.azure.hdinsight.common.mvc.IdeSchedulers;
2626
import com.microsoft.azure.hdinsight.common.mvc.SettableControl;
27-
import com.microsoft.azure.hdinsight.sdk.common.HttpResponseWithRequestIdException;
27+
import com.microsoft.azure.hdinsight.sdk.common.SparkAzureDataLakePoolServiceException;
2828
import com.microsoft.azure.hdinsight.sdk.common.azure.serverless.AzureSparkServerlessAccount;
2929
import com.microsoft.azure.hdinsight.sdk.common.azure.serverless.AzureSparkServerlessCluster;
3030
import com.microsoft.azuretools.azurecommons.helpers.NotNull;
@@ -137,8 +137,8 @@ public Observable<SparkServerlessClusterProvisionSettingsModel> validateAndProvi
137137
.map(cluster -> toUpdate)
138138
.onErrorReturn(err -> {
139139
log().warn("Error provision a cluster. " + ExceptionUtils.getStackTrace(err));
140-
if (err instanceof HttpResponseWithRequestIdException) {
141-
String requestId = ((HttpResponseWithRequestIdException) err).getRequestId();
140+
if (err instanceof SparkAzureDataLakePoolServiceException) {
141+
String requestId = ((SparkAzureDataLakePoolServiceException) err).getRequestId();
142142
toUpdate.setRequestId(requestId);
143143
log().info("x-ms-request-id: " + requestId);
144144
}

Utils/hdinsight-node-common/src/com/microsoft/azure/sparkserverless/serverexplore/SparkServerlessClusterUpdateCtrlProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.microsoft.azure.hdinsight.common.logger.ILogger;
44
import com.microsoft.azure.hdinsight.common.mvc.IdeSchedulers;
55
import com.microsoft.azure.hdinsight.common.mvc.SettableControl;
6-
import com.microsoft.azure.hdinsight.sdk.common.HttpResponseWithRequestIdException;
6+
import com.microsoft.azure.hdinsight.sdk.common.SparkAzureDataLakePoolServiceException;
77
import com.microsoft.azure.hdinsight.sdk.common.azure.serverless.AzureSparkServerlessCluster;
88
import com.microsoft.azuretools.azurecommons.helpers.NotNull;
99
import org.apache.commons.lang3.StringUtils;
@@ -67,8 +67,8 @@ public Observable<SparkServerlessClusterProvisionSettingsModel> validateAndUpdat
6767
.map(cluster -> toUpdate)
6868
.onErrorReturn(err -> {
6969
log().warn("Error update a cluster. " + ExceptionUtils.getStackTrace(err));
70-
if (err instanceof HttpResponseWithRequestIdException) {
71-
String requestId = ((HttpResponseWithRequestIdException) err).getRequestId();
70+
if (err instanceof SparkAzureDataLakePoolServiceException) {
71+
String requestId = ((SparkAzureDataLakePoolServiceException) err).getRequestId();
7272
toUpdate.setRequestId(requestId);
7373
log().info("x-ms-request-id: " + requestId);
7474
}

0 commit comments

Comments
 (0)