Skip to content

Commit 0d643f3

Browse files
authored
Merge pull request #552 from jakub-plichta/master
Use latest gooddata-rest-common
2 parents f9b16eb + 637d55e commit 0d643f3

6 files changed

Lines changed: 15 additions & 582 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
<dependency>
239239
<groupId>com.gooddata</groupId>
240240
<artifactId>gooddata-rest-common</artifactId>
241-
<version>1.0.1</version>
241+
<version>1.2.0</version>
242242
</dependency>
243243
<dependency>
244244
<groupId>com.gooddata</groupId>

src/main/java/com/gooddata/GoodData.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.gooddata.dataload.processes.ProcessService;
1313
import com.gooddata.export.ExportService;
1414
import com.gooddata.featureflag.FeatureFlagService;
15+
import com.gooddata.gdc.Header;
1516
import com.gooddata.md.maintenance.ExportImportService;
1617
import com.gooddata.notification.NotificationService;
1718
import com.gooddata.projecttemplate.ProjectTemplateService;
@@ -58,7 +59,11 @@
5859
*/
5960
public class GoodData {
6061

61-
public static final String GDC_REQUEST_ID_HEADER = "X-GDC-REQUEST";
62+
/**
63+
* @deprecated use {@link Header#GDC_REQUEST_ID} instead.
64+
*/
65+
@Deprecated
66+
public static final String GDC_REQUEST_ID_HEADER = Header.GDC_REQUEST_ID;
6267

6368
protected static final String PROTOCOL = GoodDataEndpoint.PROTOCOL;
6469
protected static final int PORT = GoodDataEndpoint.PORT;

src/main/java/com/gooddata/collections/MultiPageList.java

Lines changed: 0 additions & 300 deletions
This file was deleted.

src/main/java/com/gooddata/util/ResponseErrorHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import com.gooddata.GoodDataRestException;
99
import com.gooddata.gdc.ErrorStructure;
10+
import com.gooddata.gdc.Header;
1011
import org.springframework.http.client.ClientHttpResponse;
1112
import org.springframework.http.converter.HttpMessageConversionException;
1213
import org.springframework.http.converter.HttpMessageConverter;
@@ -17,7 +18,6 @@
1718
import java.io.IOException;
1819
import java.util.List;
1920

20-
import static com.gooddata.GoodData.GDC_REQUEST_ID_HEADER;
2121
import static com.gooddata.util.Validate.noNullElements;
2222

2323
/**
@@ -39,7 +39,7 @@ public void handleError(ClientHttpResponse response) {
3939
error = gdcErrorExtractor.extractData(response);
4040
} catch (RestClientException | IOException | HttpMessageConversionException ignored) {
4141
}
42-
final String requestId = response.getHeaders().getFirst(GDC_REQUEST_ID_HEADER);
42+
final String requestId = response.getHeaders().getFirst(Header.GDC_REQUEST_ID);
4343
int statusCode;
4444
try {
4545
statusCode = response.getRawStatusCode();

0 commit comments

Comments
 (0)