Merge branch 'master' into bug5627

This commit is contained in:
Axel Uhl
2022-12-30 15:47:34 +01:00
193 changed files with 1140 additions and 1283 deletions
@@ -38,6 +38,7 @@ import com.sap.sse.landscape.aws.AwsLandscape;
import com.sap.sse.landscape.aws.impl.AwsApplicationProcessImpl;
import com.sap.sse.landscape.impl.ReleaseImpl;
import com.sap.sse.shared.util.Wait;
import com.sap.sse.util.HttpUrlConnectionHelper;
import com.sap.sse.util.LaxRedirectStrategyForAllRedirectResponseCodes;
public class SailingAnalyticsProcessImpl<ShardingKey>
@@ -75,7 +76,8 @@ implements SailingAnalyticsProcess<ShardingKey> {
final HttpResponse result = client.execute(getStatusRequest);
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
result.getEntity().writeTo(bos);
return (JSONObject) (new JSONParser().parse(new InputStreamReader(new ByteArrayInputStream(bos.toByteArray()))));
return (JSONObject) (new JSONParser().parse(new InputStreamReader(new ByteArrayInputStream(bos.toByteArray()),
HttpUrlConnectionHelper.getCharsetFromHttpEntity(result.getEntity(), "UTF-8"))));
}, json->json != null, /* retryOnException */ true, optionalTimeout,
/* sleepBetweenAttempts */ Duration.ONE_SECOND.times(5), Level.INFO, "getStatus() on "+getHost()+":"+getPort());
updateStartTimePointFromStatus(status);