From e93872cc0f19b888a6db4b4e70d8666f2ef82773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Mikul=C3=A1=C5=A1ek?= Date: Thu, 14 Feb 2019 15:48:07 +0100 Subject: [PATCH 1/2] Remove @Deprecated gooddata-java APIs --- .../gooddata/sdk/model/account/Account.java | 10 -- .../sdk/model/connector/Settings.java | 9 - .../dataload/processes/DataloadProcess.java | 20 --- .../processes/ProcessExecutionDetail.java | 20 --- .../processes/ProcessExecutionTask.java | 10 -- .../gooddata/sdk/model/dataset/Dataset.java | 27 --- .../gooddata/sdk/model/dataset/Datasets.java | 28 --- .../afm/ArithmeticMeasureDefinition.java | 13 -- .../executeafm/afm/MeasureDefinition.java | 28 --- .../afm/NegativeAttributeFilter.java | 10 +- .../afm/OverPeriodMeasureDefinition.java | 36 ---- .../executeafm/afm/PopMeasureDefinition.java | 40 +---- .../afm/PositiveAttributeFilter.java | 10 +- .../afm/PreviousPeriodMeasureDefinition.java | 36 ---- .../afm/SimpleAttributeFilterElements.java | 4 +- .../afm/SimpleMeasureDefinition.java | 34 ---- .../executeafm/response/AttributeHeader.java | 42 ----- .../gooddata/sdk/model/gdc/AboutLinks.java | 13 +- .../java/com/gooddata/sdk/model/gdc/Gdc.java | 31 ---- .../gooddata/sdk/model/gdc/LinkEntries.java | 9 - .../com/gooddata/sdk/model/gdc/RootLinks.java | 169 ------------------ .../sdk/model/md/AttributeDisplayForm.java | 5 - .../com/gooddata/sdk/model/md/Dataset.java | 20 --- .../gooddata/sdk/model/md/DisplayForm.java | 10 -- .../java/com/gooddata/sdk/model/md/Entry.java | 11 +- .../java/com/gooddata/sdk/model/md/Meta.java | 28 --- .../sdk/model/md/NestedAttribute.java | 60 ------- .../gooddata/sdk/model/md/ScheduledMail.java | 9 - .../sdk/model/md/report/AttributeInGrid.java | 10 -- .../sdk/model/md/report/MetricElement.java | 22 +-- .../sdk/model/md/report/ReportDefinition.java | 10 -- .../visualization/VOPopMeasureDefinition.java | 7 +- .../VOSimpleMeasureDefinition.java | 15 +- .../gooddata/sdk/model/project/Project.java | 160 ----------------- ...ProjectValidationResultGdcTimeElParam.java | 9 - .../sdk/model/project/model/MaqlDdlLinks.java | 9 - .../sdk/model/report/ReportExportFormat.java | 38 ---- .../sdk/model/warehouse/WarehouseTask.java | 15 -- .../sdk/model/warehouse/WarehouseUser.java | 15 -- .../ArithmeticMeasureDefinitionTest.groovy | 22 --- .../OverPeriodMeasureDefinitionTest.groovy | 20 --- .../afm/PopMeasureDefinitionTest.groovy | 20 +-- ...PreviousPeriodMeasureDefinitionTest.groovy | 22 --- .../afm/SimpleMeasureDefinitionTest.groovy | 22 --- .../VisualizationObjectTest.groovy | 1 + .../sdk/model/account/AccountTest.java | 1 - .../processes/DataloadProcessTest.java | 1 - .../processes/ProcessExecutionTaskTest.java | 2 - .../sdk/model/dataset/DatasetTest.java | 27 --- .../sdk/model/dataset/DatasetsTest.java | 42 ----- .../sdk/model/export/ExportFormatTest.java | 8 +- .../com/gooddata/sdk/model/gdc/GdcTest.java | 50 ------ .../sdk/model/gdc/LinkEntriesTest.java | 1 - .../gooddata/sdk/model/gdc/RootLinksTest.java | 16 +- .../model/md/AttributeDisplayFormTest.java | 2 - .../gooddata/sdk/model/md/AttributeTest.java | 3 - .../gooddata/sdk/model/md/DatasetTest.java | 3 - .../sdk/model/md/DisplayFormTest.java | 2 - .../com/gooddata/sdk/model/md/EntryTest.java | 4 +- .../com/gooddata/sdk/model/md/MetaTest.java | 6 +- .../sdk/model/md/NestedAttributeTest.java | 2 - .../sdk/model/md/report/GridTest.java | 4 +- .../sdk/model/project/ProjectTest.java | 18 +- .../model/project/model/MaqlDdlLinksTest.java | 1 - .../model/report/ReportExportFormatTest.java | 27 --- .../model/warehouse/WarehouseTaskTest.java | 2 - .../src/test/resources/md/meta.json | 3 +- .../test/resources/md/report/grid-input.json | 2 +- .../gooddata/sdk/service/AbstractService.java | 12 -- .../com/gooddata/sdk/service/GoodData.java | 22 --- .../sdk/service/account/AccountService.java | 11 -- .../service/auditevent/AuditEventService.java | 12 -- .../service/connector/ConnectorService.java | 9 - .../service/dataload/OutputStageService.java | 11 -- .../dataload/processes/ProcessService.java | 63 ------- .../sdk/service/dataset/DatasetService.java | 23 --- .../service/executeafm/ExecuteAfmService.java | 8 - .../sdk/service/export/ExportException.java | 4 +- .../sdk/service/export/ExportService.java | 14 -- .../service/export/NoDataExportException.java | 5 +- .../featureflag/FeatureFlagService.java | 11 -- .../sdk/service/gdc/DataStoreService.java | 6 + .../gooddata/sdk/service/gdc/GdcService.java | 24 --- .../sdk/service/md/MetadataService.java | 8 - .../md/maintenance/ExportImportService.java | 8 - .../notification/NotificationService.java | 8 - .../sdk/service/project/ProjectService.java | 12 -- .../service/project/model/ModelService.java | 8 - .../ProjectTemplateService.java | 12 -- .../service/report/NoDataReportException.java | 26 --- .../sdk/service/report/ReportException.java | 24 --- .../sdk/service/report/ReportService.java | 84 --------- .../service/warehouse/WarehouseService.java | 12 -- .../gooddata/sdk/service/PollHandlerIT.java | 4 +- .../sdk/service/dataset/DatasetServiceIT.java | 16 -- .../service/dataset/DatasetServiceTest.java | 39 ---- .../sdk/service/gdc/GdcServiceIT.java | 16 -- .../sdk/service/report/ReportServiceTest.java | 57 ------ 98 files changed, 72 insertions(+), 1883 deletions(-) delete mode 100644 gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Dataset.java delete mode 100644 gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Datasets.java delete mode 100644 gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/Gdc.java delete mode 100644 gooddata-java-model/src/main/java/com/gooddata/sdk/model/report/ReportExportFormat.java delete mode 100644 gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataset/DatasetTest.java delete mode 100644 gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataset/DatasetsTest.java delete mode 100644 gooddata-java-model/src/test/java/com/gooddata/sdk/model/gdc/GdcTest.java delete mode 100644 gooddata-java-model/src/test/java/com/gooddata/sdk/model/report/ReportExportFormatTest.java delete mode 100644 gooddata-java/src/main/java/com/gooddata/sdk/service/report/NoDataReportException.java delete mode 100644 gooddata-java/src/main/java/com/gooddata/sdk/service/report/ReportException.java delete mode 100644 gooddata-java/src/main/java/com/gooddata/sdk/service/report/ReportService.java delete mode 100644 gooddata-java/src/test/java/com/gooddata/sdk/service/report/ReportServiceTest.java diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/Account.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/Account.java index 908873e6e..92271fe01 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/Account.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/Account.java @@ -125,16 +125,6 @@ public String getUri() { return links.getSelf(); } - /** - * @return projects URI string - * @deprecated use {@link #getProjectsUri()} instead - */ - @Deprecated - @JsonIgnore - public String getProjectsLink() { - return getProjectsUri(); - } - @JsonIgnore public String getProjectsUri() { return links.getProjects(); diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Settings.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Settings.java index ac5cb1734..cb9427a6d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Settings.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Settings.java @@ -20,15 +20,6 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public interface Settings { - /** - * Settings URL dedicated for Zendesk4 connector only. - * Other connectors have different URL than this one. - * - * @deprecated use {@link Zendesk4Settings#URL} instead - */ - @Deprecated - String URL = "/gdc/projects/{project}/connectors/{connector}/integration/settings"; - @JsonIgnore ConnectorType getConnectorType(); diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/DataloadProcess.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/DataloadProcess.java index 20a9342ff..9d003db58 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/DataloadProcess.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/DataloadProcess.java @@ -114,31 +114,11 @@ public String getId() { return TEMPLATE.match(getUri()).get("processId"); } - /** - * @return executions URI string - * @deprecated use {@link #getExecutionsUri()} instead - */ - @Deprecated - @JsonIgnore - public String getExecutionsLink() { - return getExecutionsUri(); - } - @JsonIgnore public String getExecutionsUri() { return notNullState(links, "links").get(EXECUTIONS_LINK); } - /** - * @return source URI string - * @deprecated use {@link #getSourceUri()} instead - */ - @Deprecated - @JsonIgnore - public String getSourceLink() { - return getSourceUri(); - } - @JsonIgnore public String getSourceUri() { return getUri() + "/source"; diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionDetail.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionDetail.java index ec5c42a00..a80f97cc4 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionDetail.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionDetail.java @@ -88,16 +88,6 @@ public ErrorStructure getError() { return error; } - /** - * @return log URI string - * @deprecated use {@link #getLogUri()} instead - */ - @Deprecated - @JsonIgnore - public String getLogLink() { - return getLogUri(); - } - @JsonIgnore public String getLogUri() { return notNullState(links, "links").get(LOG_LINK); @@ -108,16 +98,6 @@ public String getUri() { return notNullState(links, "links").get(SELF_LINK); } - /** - * @return execution URI string - * @deprecated use {@link #getExecutionUri()} instead - */ - @Deprecated - @JsonIgnore - public String getExecutionLink() { - return getExecutionUri(); - } - @JsonIgnore public String getExecutionUri() { return notNullState(links, "links").get(EXECUTION_LINK); diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionTask.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionTask.java index 65e152c49..89fdabcfc 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionTask.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionTask.java @@ -33,20 +33,10 @@ private ProcessExecutionTask(@JsonProperty("links") Map links) { this.links = links; } - @Deprecated - String getPollLink() { - return getPollUri(); - } - public String getPollUri() { return notNullState(links, "links").get(POLL_LINK); } - @Deprecated - String getDetailLink() { - return getDetailUri(); - } - public String getDetailUri() { return notNullState(links, "links").get(DETAIL_LINK); } diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Dataset.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Dataset.java deleted file mode 100644 index 4d1704a53..000000000 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Dataset.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved. - * This source code is licensed under the BSD-style license found in the - * LICENSE.txt file in the root directory of this source tree. - */ -package com.gooddata.sdk.model.dataset; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.gdc.AboutLinks; - -/** - * Dataset link - * - * @deprecated use {@link AboutLinks.Link} instead - */ -@Deprecated -@JsonIgnoreProperties(ignoreUnknown = true) -public class Dataset extends AboutLinks.Link { - - @JsonCreator - public Dataset(@JsonProperty("identifier") String identifier, @JsonProperty("link") String uri, - @JsonProperty("title") String title) { - super(identifier, uri, title, null, null); - } -} diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Datasets.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Datasets.java deleted file mode 100644 index ea5bd4c26..000000000 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Datasets.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved. - * This source code is licensed under the BSD-style license found in the - * LICENSE.txt file in the root directory of this source tree. - */ -package com.gooddata.sdk.model.dataset; - -import com.fasterxml.jackson.annotation.*; -import com.gooddata.sdk.model.gdc.AboutLinks; - -import java.util.List; - -/** - * Dataset links - * @deprecated use {@link DatasetLinks} instead. - */ -@Deprecated -public class Datasets extends AboutLinks { - - public static final String URI = "/gdc/md/{project}/ldm/singleloadinterface"; - - @JsonCreator - public Datasets(@JsonProperty("category") String category, @JsonProperty("summary") String summary, - @JsonProperty("links") List links) { - super(category, summary, null, links); - } - -} diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ArithmeticMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ArithmeticMeasureDefinition.java index 95b981a52..1b0d2ea14 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ArithmeticMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ArithmeticMeasureDefinition.java @@ -9,7 +9,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import com.gooddata.sdk.model.executeafm.ObjQualifier; -import com.gooddata.sdk.model.executeafm.UriObjQualifier; import com.gooddata.util.GoodDataToStringBuilder; import java.util.Collection; @@ -42,12 +41,6 @@ public ArithmeticMeasureDefinition( this.operator = operator; } - @Deprecated - @Override - public ObjQualifier getObjQualifier() { - throw new UnsupportedOperationException("not supported operation"); - } - /** * no qualifiers are used, only local identifiers are used see {@link ArithmeticMeasureDefinition#getOperator()} * @return empty set @@ -57,12 +50,6 @@ public Collection getObjQualifiers() { return Collections.EMPTY_SET; //has no qualifiers } - @Deprecated - @Override - public MeasureDefinition withObjUriQualifier(UriObjQualifier qualifier) { - throw new UnsupportedOperationException("not supported operation"); - } - /** * no conversion is done, because this definition uses only local identifiers * @return this instance diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureDefinition.java index 187b7d7a3..839c842fc 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureDefinition.java @@ -41,19 +41,6 @@ default String getUri() { throw new UnsupportedOperationException("This definition has no URI"); } - /** - * Returns the qualifier, qualifying the {@link Metric}. - * - * @return qualifier of measure - * - * @throws UnsupportedOperationException - * The exception is thrown when the method is not supported by the implementation. - * @deprecated Use {@link #withObjUriQualifiers(ObjQualifierConverter)} instead as this method is not supported by all the existing implementations. - */ - @JsonIgnore - @Deprecated - ObjQualifier getObjQualifier(); - /** * Returns all the qualifiers used by the measure definition and its encapsulated objects. *

@@ -65,21 +52,6 @@ default String getUri() { @JsonIgnore Collection getObjQualifiers(); - /** - * Copy itself using given URI qualifier. - * - * @param qualifier - * The qualifier to use by the new object. - * - * @return self copy with given qualifier - * - * @throws UnsupportedOperationException - * The exception is thrown when the method is not supported by the implementation. - * @deprecated Use {@link #withObjUriQualifiers(ObjQualifierConverter)} instead as this method is not supported by all the existing implementations. - */ - @Deprecated - MeasureDefinition withObjUriQualifier(UriObjQualifier qualifier); - /** * Copy itself using the given object qualifier converter in case when {@link IdentifierObjQualifier} instances are used in the object otherwise the * original object is returned. diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/NegativeAttributeFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/NegativeAttributeFilter.java index cc208bb43..551026770 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/NegativeAttributeFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/NegativeAttributeFilter.java @@ -31,8 +31,10 @@ public class NegativeAttributeFilter extends AttributeFilter { /** * Creates new instance of given display form and not in list + * * @param displayForm display form - * @param notIn list of not in elements + * @param notIn list of not in elements + * @deprecated for compatibility with version 2.x only, use {@link #NegativeAttributeFilter(ObjQualifier, AttributeFilterElements)} instead */ @Deprecated public NegativeAttributeFilter(@JsonProperty("displayForm") final ObjQualifier displayForm, @@ -42,8 +44,9 @@ public NegativeAttributeFilter(@JsonProperty("displayForm") final ObjQualifier d /** * Creates new instance of given display form and not in list + * * @param displayForm display form - * @param notIn not in elements (uris or values) + * @param notIn not in elements (uris or values) */ @JsonCreator public NegativeAttributeFilter(@JsonProperty("displayForm") final ObjQualifier displayForm, @@ -52,6 +55,9 @@ public NegativeAttributeFilter(@JsonProperty("displayForm") final ObjQualifier d this.notIn = notIn; } + /** + * @deprecated for compatibility with version 2.x only, use {@link #NegativeAttributeFilter(ObjQualifier, AttributeFilterElements)} instead + */ @Deprecated public NegativeAttributeFilter(final ObjQualifier displayForm, final String... notIn) { this(displayForm, asList(notIn)); diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/OverPeriodMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/OverPeriodMeasureDefinition.java index a3eee0a6a..4ecb034fa 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/OverPeriodMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/OverPeriodMeasureDefinition.java @@ -9,7 +9,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import com.gooddata.sdk.model.executeafm.ObjQualifier; -import com.gooddata.sdk.model.executeafm.UriObjQualifier; import com.gooddata.util.GoodDataToStringBuilder; import java.util.Collection; @@ -52,22 +51,6 @@ public OverPeriodMeasureDefinition( this.dateAttributes = notEmpty(dateAttributes, "dateAttributes"); } - /** - * The method is not supported by the object. - * Use {@link #getObjQualifiers()} instead. - * - * @return throws {@link UnsupportedOperationException} - * - * @throws UnsupportedOperationException - * The exception is thrown every time the method is called. - * @deprecated Use {@link #getObjQualifiers()} instead. - */ - @Override - @Deprecated - public ObjQualifier getObjQualifier() { - throw new UnsupportedOperationException("The method is not supported by the object!"); - } - @Override public Collection getObjQualifiers() { return this.dateAttributes.stream() @@ -75,25 +58,6 @@ public Collection getObjQualifiers() { .collect(Collectors.toSet()); } - /** - * The method is not supported by the object. - * Use {@link #withObjUriQualifiers(ObjQualifierConverter)} instead. - * - * @param uriQualifier - * The URI object qualifier. - * - * @return throws {@link UnsupportedOperationException} - * - * @throws UnsupportedOperationException - * The exception is thrown every time the method is called. - * @deprecated Use {@link #withObjUriQualifiers(ObjQualifierConverter)} instead. - */ - @Override - @Deprecated - public MeasureDefinition withObjUriQualifier(final UriObjQualifier uriQualifier) { - throw new UnsupportedOperationException("The method is not supported by the object!"); - } - @Override public MeasureDefinition withObjUriQualifiers(final ObjQualifierConverter objQualifierConverter) { notNull(objQualifierConverter, "objQualifierConverter"); diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PopMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PopMeasureDefinition.java index e722b632b..bbc4b0e7c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PopMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PopMeasureDefinition.java @@ -10,22 +10,19 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import com.gooddata.sdk.model.executeafm.ObjQualifier; -import com.gooddata.sdk.model.executeafm.UriObjQualifier; -import com.gooddata.sdk.model.md.Metric; import com.gooddata.util.GoodDataToStringBuilder; import java.util.Collection; import java.util.Collections; import java.util.Objects; -import java.util.Optional; import static com.gooddata.sdk.model.executeafm.afm.PopMeasureDefinition.NAME; /** * Definition of so called "period over period" measure. - *

- * The definition is deprecated. Use {@link OverPeriodMeasureDefinition} with {@link OverPeriodDateAttribute#getPeriodsAgo()} set to {@code - * 1} instead. + * + * @deprecated Use {@link OverPeriodMeasureDefinition} with {@link OverPeriodDateAttribute#getPeriodsAgo()} set to {@code 1} instead. + * Let's remove it once it's removed from API. */ @Deprecated @JsonRootName(NAME) @@ -78,21 +75,6 @@ public ObjQualifier getPopAttribute() { return popAttribute; } - /** - * Returns the qualifier used by the {@link Metric}. - * - * @return qualifier used by the metric, which is its {@link #popAttribute}. The null is returned in case when {@link #popAttribute} was not set. - * - * @deprecated Use {@link #getObjQualifiers()} instead. - */ - @Override - @Deprecated - public ObjQualifier getObjQualifier() { - return getObjQualifiers().stream() - .findFirst() - .orElse(null); - } - @Override public Collection getObjQualifiers() { return popAttribute == null @@ -100,22 +82,6 @@ public Collection getObjQualifiers() { : Collections.singleton(popAttribute); } - /** - * Copy itself using given URI qualifier. - * - * @param uriQualifier - * The qualifier to use by the new object instead of the currently used one. - * - * @return self copy with given qualifier - * - * @deprecated Use {@link #withObjUriQualifiers(ObjQualifierConverter)} instead. - */ - @Override - @Deprecated - public MeasureDefinition withObjUriQualifier(final UriObjQualifier uriQualifier) { - return withObjUriQualifiers((identifierObjQualifier) -> Optional.of(uriQualifier)); - } - @Override public boolean equals(final Object o) { if (this == o) return true; diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PositiveAttributeFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PositiveAttributeFilter.java index 56678d0b0..9f7b91665 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PositiveAttributeFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PositiveAttributeFilter.java @@ -31,8 +31,10 @@ public class PositiveAttributeFilter extends AttributeFilter { /** * Creates new instance of given display form and in list + * * @param displayForm display form - * @param in list of in elements + * @param in list of in elements + * @deprecated for compatibility with version 2.x only, use {@link #PositiveAttributeFilter(ObjQualifier, AttributeFilterElements)} instead */ @Deprecated public PositiveAttributeFilter(final ObjQualifier displayForm, final List in) { @@ -41,8 +43,9 @@ public PositiveAttributeFilter(final ObjQualifier displayForm, final List getObjQualifiers() { return this.dateDataSets.stream() @@ -75,25 +58,6 @@ public Collection getObjQualifiers() { .collect(Collectors.toSet()); } - /** - * The method is not supported by the object. - * Use {@link #withObjUriQualifiers(ObjQualifierConverter)} instead. - * - * @param uriQualifier - * The URI object qualifier. - * - * @return throws {@link UnsupportedOperationException} - * - * @throws UnsupportedOperationException - * The exception is thrown every time the method is called. - * @deprecated Use {@link #withObjUriQualifiers(ObjQualifierConverter)} instead. - */ - @Override - @Deprecated - public MeasureDefinition withObjUriQualifier(final UriObjQualifier uriQualifier) { - throw new UnsupportedOperationException("The method is not supported by the object!"); - } - @Override public MeasureDefinition withObjUriQualifiers(final ObjQualifierConverter objQualifierConverter) { notNull(objQualifierConverter, "objQualifierConverter"); diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/SimpleAttributeFilterElements.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/SimpleAttributeFilterElements.java index 7538fea69..8d74dd713 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/SimpleAttributeFilterElements.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/SimpleAttributeFilterElements.java @@ -11,7 +11,9 @@ import static com.gooddata.util.Validate.notNull; /** - * {@link AttributeFilterElements} represented by simple array. It has the same semantic as {@link UriAttributeFilterElements}. + * {@link AttributeFilterElements} represented by simple array. + * + * @deprecated It has the same semantic as {@link UriAttributeFilterElements}. * Preserved because of compatibility and will be removed in future API version. */ @Deprecated diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/SimpleMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/SimpleMeasureDefinition.java index 16d1032d3..6e131f4ca 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/SimpleMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/SimpleMeasureDefinition.java @@ -10,8 +10,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import com.gooddata.sdk.model.executeafm.ObjQualifier; -import com.gooddata.sdk.model.executeafm.UriObjQualifier; -import com.gooddata.sdk.model.md.Metric; import com.gooddata.util.GoodDataToStringBuilder; import java.util.ArrayList; @@ -19,7 +17,6 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import java.util.Optional; import static com.gooddata.sdk.model.executeafm.afm.SimpleMeasureDefinition.NAME; import static com.gooddata.util.Validate.notNull; @@ -120,21 +117,6 @@ public String getUri() { return getItem().getUri(); } - /** - * Returns the qualifier used by the {@link Metric}. - * - * @return qualifier used by the metric, which is its {@link #item}. The null is returned in case when {@link #item} was not set. - * - * @deprecated Use {@link #getObjQualifiers()} instead. - */ - @Override - @Deprecated - public ObjQualifier getObjQualifier() { - return getObjQualifiers().stream() - .findFirst() - .orElse(null); - } - @Override public Collection getObjQualifiers() { return item == null @@ -142,22 +124,6 @@ public Collection getObjQualifiers() { : Collections.singleton(item); } - /** - * Copy itself using given URI qualifier. - * - * @param uriQualifier - * The qualifier to use by the new object instead of the currently used one. - * - * @return self copy with given qualifier - * - * @deprecated Use {@link #withObjUriQualifiers(ObjQualifierConverter)} instead. - */ - @Override - @Deprecated - public MeasureDefinition withObjUriQualifier(final UriObjQualifier uriQualifier) { - return withObjUriQualifiers((identifierObjQualifier) -> Optional.of(uriQualifier)); - } - /** * @return measured item, can be attribute, fact or another measure */ diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/AttributeHeader.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/AttributeHeader.java index 7a84a6d74..280702146 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/AttributeHeader.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/AttributeHeader.java @@ -34,48 +34,6 @@ public class AttributeHeader implements Header, LocallyIdentifiable { private List totalItems; - /** - * Creates new header - * @deprecated use the constructor with {@link AttributeInHeader} - * - * @param name name - * @param localIdentifier local identifier - * @param uri uri - * @param identifier identifier - */ - @Deprecated - public AttributeHeader(final String name, final String localIdentifier, final String uri, final String identifier) { - this.name = notEmpty(name, "name"); - this.localIdentifier = notEmpty(localIdentifier, "localIdentifier"); - this.uri = notEmpty(uri, "uri"); - this.identifier = notEmpty(identifier, "identifier"); - this.formOf = null; - } - - /** - * Creates new header - * @deprecated use the constructor with {@link AttributeInHeader} - * - * @param name name - * @param localIdentifier local identifier - * @param uri uri - * @param identifier identifier - * @param totalHeaderItems total header items - */ - @Deprecated - public AttributeHeader(final String name, - final String localIdentifier, - final String uri, - final String identifier, - final List totalHeaderItems) { - this.name = notEmpty(name, "name"); - this.localIdentifier = notEmpty(localIdentifier, "localIdentifier"); - this.uri = notEmpty(uri, "uri"); - this.identifier = notEmpty(identifier, "identifier"); - this.formOf = null; - this.totalItems = totalHeaderItems; - } - /** * Creates new header * @param name name diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AboutLinks.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AboutLinks.java index fec50ff18..bc12dcbe2 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AboutLinks.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AboutLinks.java @@ -79,6 +79,10 @@ public Link(@JsonProperty("identifier") String identifier, @JsonProperty("link") this.summary = summary; } + public Link(String identifier, String uri, String title) { + this(identifier, uri, title, null, null); + } + public String getIdentifier() { return identifier; } @@ -87,15 +91,6 @@ public String getUri() { return uri; } - /** - * @return self URI string - * @deprecated use {@link #getUri()} instead - */ - @Deprecated - public String getLink() { - return getUri(); - } - public String getTitle() { return title; } diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/Gdc.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/Gdc.java deleted file mode 100644 index 16aeb7f0a..000000000 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/Gdc.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved. - * This source code is licensed under the BSD-style license found in the - * LICENSE.txt file in the root directory of this source tree. - */ -package com.gooddata.sdk.model.gdc; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.List; - -/** - * GoodData API root links (aka "about" or "home"). - * Deserialization only. - * @deprecated use {@link RootLinks} instead - */ -@Deprecated -public class Gdc extends RootLinks { - - /** - * URI of GoodData API root - */ - public static final String URI = "/gdc"; - - @JsonCreator - public Gdc(@JsonProperty("links") List links) { - super(links); - } - -} \ No newline at end of file diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/LinkEntries.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/LinkEntries.java index 9b96fb37f..3e6e1ba98 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/LinkEntries.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/LinkEntries.java @@ -46,15 +46,6 @@ private LinkEntry(@JsonProperty("link") String uri, @JsonProperty("category") St this.category = category; } - /** - * @return self URI string - * @deprecated use {@link #getUri()} instead - */ - @Deprecated - public String getLink() { - return getUri(); - } - public String getUri() { return uri; } diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/RootLinks.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/RootLinks.java index caeb5851f..ebe3141cb 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/RootLinks.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/RootLinks.java @@ -28,19 +28,6 @@ public RootLinks(@JsonProperty("links") List links) { super(null, null, null, links); } - /** - * Get GoodData API root URI string - * - * @return GoodData API root URI string - * @deprecated use {@link #getHomeUri()} instead - * @throws GoodDataException in case no link with such category found - */ - @Deprecated - @JsonIgnore - public String getHomeLink() { - return getHomeUri(); - } - /** * Get GoodData API root URI string * @@ -52,19 +39,6 @@ public String getHomeUri() { return getLink(LinkCategory.HOME).getUri(); } - /** - * Get temporary token generator URI string - * - * @return temporary token generator URI string - * @deprecated use {@link #getTokenUri()} instead - * @throws GoodDataException in case no link with such category found - */ - @Deprecated - @JsonIgnore - public String getTokenLink() { - return getTokenUri(); - } - /** * Get temporary token generator URI string * @@ -76,19 +50,6 @@ public String getTokenUri() { return getLink(LinkCategory.TOKEN).getUri(); } - /** - * Get authentication service URI string - * - * @return authentication service URI string - * @deprecated use {@link #getLoginUri()} instead - * @throws GoodDataException in case no link with such category found - */ - @Deprecated - @JsonIgnore - public String getLoginLink() { - return getLoginUri(); - } - /** * Get authentication service URI string * @@ -100,19 +61,6 @@ public String getLoginUri() { return getLink(LinkCategory.LOGIN).getUri(); } - /** - * Get metadata resources URI string - * - * @return metadata resources URI string - * @deprecated use {@link #getMetadataUri()} instead - * @throws GoodDataException in case no link with such category found - */ - @Deprecated - @JsonIgnore - public String getMetadataLink() { - return getMetadataUri(); - } - /** * Get metadata resources URI string * @@ -124,19 +72,6 @@ public String getMetadataUri() { return getLink(LinkCategory.METADATA).getUri(); } - /** - * Get report execution resource URI string - * - * @return report execution resource URI string - * @deprecated use {@link #getXTabUri()} instead - * @throws GoodDataException in case no link with such category found - */ - @Deprecated - @JsonIgnore - public String getXTabLink() { - return getXTabUri(); - } - /** * Get report execution resource URI string * @@ -148,19 +83,6 @@ public String getXTabUri() { return getLink(LinkCategory.XTAB).getUri(); } - /** - * Get URI string of resource used to determine valid attribute values in the context of a report - * - * @return URI string of resource used to determine valid attribute values in the context of a report - * @deprecated use {@link #getAvailableElementsUri()} instead - * @throws GoodDataException in case no link with such category found - */ - @Deprecated - @JsonIgnore - public String getAvailableElementsLink() { - return getAvailableElementsUri(); - } - /** * Get URI string of resource used to determine valid attribute values in the context of a report * @@ -172,19 +94,6 @@ public String getAvailableElementsUri() { return getLink(LinkCategory.AVAILABLE_ELEMENTS).getUri(); } - /** - * Get report exporting resource URI string - * - * @return report exporting resource URI string - * @deprecated use {@link #getReportExporterUri()} instead - * @throws GoodDataException in case no link with such category found - */ - @Deprecated - @JsonIgnore - public String getReportExporterLink() { - return getReportExporterUri(); - } - /** * Get report exporting resource URI string * @@ -196,19 +105,6 @@ public String getReportExporterUri() { return getLink(LinkCategory.REPORT_EXPORTER).getUri(); } - /** - * Get account manipulation resource URI string - * - * @return account manipulation resource URI string - * @deprecated use {@link #getAccountUri()} instead - * @throws GoodDataException in case no link with such category found - */ - @Deprecated - @JsonIgnore - public String getAccountLink() { - return getAccountUri(); - } - /** * Get account manipulation resource URI string * @@ -220,19 +116,6 @@ public String getAccountUri() { return getLink(LinkCategory.ACCOUNT).getUri(); } - /** - * Get user and project management resource URI string - * - * @return user and project management resource URI string - * @deprecated use {@link #getProjectsUri()} instead - * @throws GoodDataException in case no link with such category found - */ - @Deprecated - @JsonIgnore - public String getProjectsLink() { - return getProjectsUri(); - } - /** * Get user and project management resource URI string * @@ -244,19 +127,6 @@ public String getProjectsUri() { return getLink(LinkCategory.PROJECTS).getUri(); } - /** - * Get miscellaneous tool resource URI string - * - * @return miscellaneous tool resource URI string - * @deprecated use {@link #getToolUri()} instead - * @throws GoodDataException in case no link with such category found - */ - @Deprecated - @JsonIgnore - public String getToolLink() { - return getToolUri(); - } - /** * Get miscellaneous tool resource URI string * @@ -268,19 +138,6 @@ public String getToolUri() { return getLink(LinkCategory.TOOL).getUri(); } - /** - * Get template resource URI string - * - * @return template resource URI string - * @deprecated use {@link #getTemplatesUri()} instead - * @throws GoodDataException in case no link with such category found - */ - @Deprecated - @JsonIgnore - public String getTemplatesLink() { - return getTemplatesUri(); - } - /** * Get template resource URI string * @@ -292,19 +149,6 @@ public String getTemplatesUri() { return getLink(LinkCategory.TEMPLATES).getUri(); } - /** - * Get release information URI string - * - * @return release information URI string - * @deprecated use {@link #getReleaseInfoUri()} instead - * @throws GoodDataException in case no link with such category found - */ - @Deprecated - @JsonIgnore - public String getReleaseInfoLink() { - return getReleaseInfoUri(); - } - /** * Get release information URI string * @@ -316,19 +160,6 @@ public String getReleaseInfoUri() { return getLink(LinkCategory.RELEASE_INFO).getUri(); } - /** - * Get user data staging area URI string - * - * @return user data staging area URI string - * @deprecated use {@link #getUserStagingUri()} instead - * @throws GoodDataException in case no link with such category found - */ - @Deprecated - @JsonIgnore - public String getUserStagingLink() { - return getUserStagingUri(); - } - /** * Get user data staging area URI string * diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeDisplayForm.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeDisplayForm.java index afbad060f..221e9fc65 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeDisplayForm.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeDisplayForm.java @@ -22,10 +22,6 @@ public class AttributeDisplayForm extends DisplayForm implements Updatable { private static final long serialVersionUID = -7903851496647992573L; - /** @deprecated use {@link #attributeContent} instead */ - @Deprecated - protected final AttributeContent content; - @JsonProperty("content") protected final AttributeContent attributeContent; @@ -33,7 +29,6 @@ public class AttributeDisplayForm extends DisplayForm implements Updatable { private AttributeDisplayForm(@JsonProperty("meta") Meta meta, @JsonProperty("content") AttributeContent content, @JsonProperty("links") Links links) { super(meta, content, links); - this.content = content; this.attributeContent = content; } diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Dataset.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Dataset.java index 14e1baf86..8f7f229ad 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Dataset.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Dataset.java @@ -86,31 +86,11 @@ public boolean hasUploadConfiguration() { return Boolean.TRUE.equals(content.hasUploadConfiguration()); } - /** - * @return data uploads URI string - * @deprecated use {@link #getDataUploadsUri()} instead - */ - @Deprecated - @JsonIgnore - public String getDataUploadsLink() { - return getDataUploadsUri(); - } - @JsonIgnore public String getDataUploadsUri() { return notNullState(links, "links").get(DATA_UPLOADS_LINK); } - /** - * @return upload configuration URI string - * @deprecated use {@link #getUploadConfigurationUri()} instead - */ - @Deprecated - @JsonIgnore - public String getUploadConfigurationLink() { - return getUploadConfigurationUri(); - } - @JsonIgnore public String getUploadConfigurationUri() { return notNullState(links, "links").get(UPLOAD_CONFIGURATION_LINK); diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DisplayForm.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DisplayForm.java index 5cb0dc2c0..480e49d43 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DisplayForm.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DisplayForm.java @@ -57,16 +57,6 @@ public String getType() { return content.getType(); } - /** - * @return elements URI string - * @deprecated use {@link #getElementsUri()} instead - */ - @Deprecated - @JsonIgnore - public String getElementsLink() { - return getElementsUri(); - } - @JsonIgnore public String getElementsUri() { return links.getElements(); diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Entry.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Entry.java index 003e3b3e5..0133cc668 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Entry.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Entry.java @@ -65,15 +65,6 @@ public Entry(@JsonProperty("link") String uri, this.unlisted = unlisted; } - /** - * @return self URI string - * @deprecated use {@link #getUri()} instead - */ - @Deprecated - public String getLink() { - return getUri(); - } - /** * Returns internally generated ID of the object (that's part of the object URI). * @return internal ID of the object @@ -83,7 +74,7 @@ public String getId() { return Obj.OBJ_TEMPLATE.match(getUri()).get("objId"); } - @JsonIgnore + @JsonProperty("link") public String getUri() { return uri; } diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Meta.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Meta.java index 388f4332e..baa1e667d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Meta.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Meta.java @@ -81,34 +81,6 @@ protected Meta(@JsonProperty("author") String author, this.flags = flags; } - /** - * @param author - * @param contributor - * @param created - * @param updated - * @param summary - * @param title - * @param category - * @param tags - * @param uri - * @param identifier - * @param deprecated - * @param production - * @param locked - * @param unlisted - * @param sharedWithSomeone - * @deprecated use {@link #Meta(String, String, DateTime, DateTime, String, String, String, Set, - * String, String, Boolean, Boolean, Boolean, Boolean, Boolean, Set)} instead - */ - @Deprecated - public Meta(String author, String contributor, DateTime created, DateTime updated, String summary, - String title, String category, Set tags, String uri, String identifier, - Boolean deprecated, Boolean production, Boolean locked, Boolean unlisted, - Boolean sharedWithSomeone) { - this(author, contributor, created, updated, summary, title, category, tags, uri, identifier, - deprecated, production, locked, unlisted, sharedWithSomeone, null); - } - /** * Constructor with "extra" flags argument * diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/NestedAttribute.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/NestedAttribute.java index 0e62267c0..8776b6328 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/NestedAttribute.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/NestedAttribute.java @@ -50,16 +50,6 @@ public DisplayForm getDefaultDisplayForm() { return getDisplayForms().iterator().next(); } - /** - * @return dimension URI string - * @deprecated use {@link #getDimensionUri()} instead - */ - @Deprecated - @JsonIgnore - public String getDimensionLink() { - return getDimensionUri(); - } - @JsonIgnore public String getDimensionUri() { return content.getDimensionUri(); @@ -129,31 +119,11 @@ public Collection getCompositeAttributePk() { return content.getCompositeAttributePk(); } - /** - * @return drill-down step display form URI string - * @deprecated use {@link #getDrillDownStepDisplayFormUri()} instead - */ - @Deprecated - @JsonIgnore - public String getDrillDownStepDisplayFormLink() { - return getDrillDownStepDisplayFormUri(); - } - @JsonIgnore public String getDrillDownStepDisplayFormUri() { return content.getDrillDownStepDisplayFormUri(); } - /** - * @return linked display form URI string - * @deprecated use {@link #getLinkedDisplayFormUri()} instead - */ - @Deprecated - @JsonIgnore - public String getLinkedDisplayFormLink() { - return getLinkedDisplayFormUri(); - } - @JsonIgnore public String getLinkedDisplayFormUri() { return content.getLinkedDisplayFormUri(); @@ -240,16 +210,6 @@ public Collection getDisplayForms() { return displayForms; } - /** - * @return dimension URI string - * @deprecated use {@link #getDimensionUri()} instead - */ - @Deprecated - @JsonIgnore - public String getDimensionLink() { - return getDimensionUri(); - } - @JsonProperty("dimension") public String getDimensionUri() { return dimension; @@ -280,31 +240,11 @@ public Collection getCompositeAttributePk() { return compositeAttributePk; } - /** - * @return drill-down step display form URI string - * @deprecated use {@link #getDrillDownStepDisplayFormUri()} instead - */ - @Deprecated - @JsonIgnore - public String getDrillDownStepDisplayFormLink() { - return getDrillDownStepDisplayFormUri(); - } - @JsonProperty("drillDownStepAttributeDF") public String getDrillDownStepDisplayFormUri() { return drillDownStepAttributeDF; } - /** - * @return linked display form URI string - * @deprecated use {@link #getLinkedDisplayFormUri()} instead - */ - @Deprecated - @JsonIgnore - public String getLinkedDisplayFormLink() { - return getLinkedDisplayFormUri(); - } - @JsonProperty("linkAttributeDF") public String getLinkedDisplayFormUri() { return linkedDisplayFormUri; diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ScheduledMail.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ScheduledMail.java index ce826d153..bfff01048 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ScheduledMail.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ScheduledMail.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.*; import com.gooddata.sdk.model.export.ExportFormat; import com.gooddata.sdk.model.md.report.ReportDefinition; -import com.gooddata.sdk.model.report.ReportExportFormat; import com.gooddata.util.GoodDataToStringBuilder; import org.joda.time.LocalDate; @@ -252,14 +251,6 @@ public ScheduledMail addReportAttachment(ReportDefinition reportDefinition, Map< return this; } - /** - * @deprecated use {@link #addReportAttachment(ReportDefinition, Map, ExportFormat...)} - */ - @Deprecated - public ScheduledMail addReportAttachment(ReportDefinition reportDefinition, Map exportOptions, ReportExportFormat... formats) { - return addReportAttachment(reportDefinition, exportOptions, ReportExportFormat.arrayToStringArray(formats)); - } - public ScheduledMail addReportAttachment(ReportDefinition reportDefinition, Map exportOptions, ExportFormat... formats) { return addReportAttachment(reportDefinition, exportOptions, ExportFormat.arrayToStringArray(formats)); } diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/AttributeInGrid.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/AttributeInGrid.java index 8f41f917b..fe502fd25 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/AttributeInGrid.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/AttributeInGrid.java @@ -45,16 +45,6 @@ public class AttributeInGrid implements GridElement, Serializable { this.totals = totals; } - /** - * Creates new instance from given uri with empty alias - * @param uri uri of displayForm of attribute to be in grid - * @deprecated because empty alias does not make much sense - */ - @Deprecated - public AttributeInGrid(String uri) { - this(uri, ""); - } - /** * Creates new instance. * @param uri uri of displayForm of attribute to be in grid diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/MetricElement.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/MetricElement.java index b6863b0b6..f7905fe49 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/MetricElement.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/MetricElement.java @@ -31,31 +31,20 @@ public class MetricElement implements Serializable { @JsonCreator MetricElement(@JsonProperty("uri") final String uri, - @JsonProperty("alias") final String alias, - @JsonProperty("format") final String format, - @JsonProperty("drillAcrossStepAttributeDF") String drillAcrossStepAttributeDisplayFormUri) { + @JsonProperty("alias") final String alias, + @JsonProperty("format") final String format, + @JsonProperty("drillAcrossStepAttributeDF") String drillAcrossStepAttributeDisplayFormUri) { this.uri = uri; this.alias = alias; this.format = format; this.drillAcrossStepAttributeDisplayFormUri = drillAcrossStepAttributeDisplayFormUri; } - /** - * Creates a new metric element - * @param uri metric uri - * @param alias metric alias - * @deprecated for compatibility with 1.x only, - * use {@link #MetricElement(Metric, String)} or {@link #MetricElement(Metric)} - */ - @Deprecated - public MetricElement(String uri, String alias) { - this(uri, alias, null, null); - } - /** * Creates new instance using uri of given metric and alias. + * * @param metric metric to create element from - * @param alias metric alias + * @param alias metric alias */ public MetricElement(final Metric metric, final String alias) { this(notNull(notNull(metric, "metric").getUri(), "uri"), notNull(alias, "alias"), null, null); @@ -63,6 +52,7 @@ public MetricElement(final Metric metric, final String alias) { /** * Creates new instance using uri of given metric and it's title as alias. + * * @param metric metric to create element from */ public MetricElement(final Metric metric) { diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/ReportDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/ReportDefinition.java index ff96bc317..ac339291a 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/ReportDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/ReportDefinition.java @@ -66,16 +66,6 @@ public Grid getGrid() { return content.getGrid(); } - /** - * @return explain URI string - * @deprecated use {@link #getExplainUri()} instead - */ - @Deprecated - @JsonIgnore - public String getExplainLink() { - return getExplainUri(); - } - @JsonIgnore public String getExplainUri() { return notNullState(links, "links").get(EXPLAIN_LINK); diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOPopMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOPopMeasureDefinition.java index ae338bd17..a9dc7f894 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOPopMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOPopMeasureDefinition.java @@ -18,6 +18,7 @@ * Period over Period measure definition to be used within {@link Measure} * * @deprecated identical with {@link PopMeasureDefinition}, see https://github.com/gooddata/gooddata-java/issues/581 + * Let's remove it once it's removed from API. */ @Deprecated @JsonInclude(JsonInclude.Include.NON_NULL) @@ -30,10 +31,8 @@ public class VOPopMeasureDefinition extends PopMeasureDefinition { /** * Creates instance of Period over Period measure definition to be used in {@link VisualizationObject} * - * @param measureIdentifier - * reference to local identifier of {@link VOSimpleMeasureDefinition} over which is PoP calculated - * @param popAttribute - * uri to attribute used for PoP + * @param measureIdentifier reference to local identifier of {@link VOSimpleMeasureDefinition} over which is PoP calculated + * @param popAttribute uri to attribute used for PoP */ @JsonCreator public VOPopMeasureDefinition(@JsonProperty("measureIdentifier") final String measureIdentifier, diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOSimpleMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOSimpleMeasureDefinition.java index 2080d2af6..26de9edad 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOSimpleMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOSimpleMeasureDefinition.java @@ -21,7 +21,9 @@ /** * Simple measure definition to be used within {@link Measure} + * * @deprecated identical with {@link MeasureDefinition}, see https://github.com/gooddata/gooddata-java/issues/581 + * Let's remove it once it's removed from API. */ @Deprecated @JsonInclude(JsonInclude.Include.NON_NULL) @@ -42,10 +44,11 @@ public VOSimpleMeasureDefinition(ObjQualifier item) { /** * Creates instance of simple measure definition to be used in {@link VisualizationObject} - * @param item uri to measure - * @param aggregation used aggregation function + * + * @param item uri to measure + * @param aggregation used aggregation function * @param computeRatio indicates if result should be calculated in percents - * @param filters filters by which measure is filtered + * @param filters filters by which measure is filtered */ @JsonCreator public VOSimpleMeasureDefinition(@JsonProperty("item") final ObjQualifier item, @@ -60,7 +63,8 @@ public VOSimpleMeasureDefinition(@JsonProperty("item") final ObjQualifier item, * * @see SimpleMeasureDefinition#SimpleMeasureDefinition(ObjQualifier, Aggregation, Boolean, List) */ - public VOSimpleMeasureDefinition(ObjQualifier item, Aggregation aggregation, Boolean computeRatio, List filters) { + public VOSimpleMeasureDefinition(ObjQualifier item, Aggregation aggregation, Boolean computeRatio, + List filters) { super(item, aggregation, computeRatio, filters); } @@ -69,7 +73,8 @@ public VOSimpleMeasureDefinition(ObjQualifier item, Aggregation aggregation, Boo * * @see SimpleMeasureDefinition#SimpleMeasureDefinition(ObjQualifier, Aggregation, Boolean, FilterItem...) */ - public VOSimpleMeasureDefinition(ObjQualifier item, Aggregation aggregation, Boolean computeRatio, FilterItem... filters) { + public VOSimpleMeasureDefinition(ObjQualifier item, Aggregation aggregation, Boolean computeRatio, + FilterItem... filters) { super(item, aggregation, computeRatio, filters); } } diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Project.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Project.java index bb0889b6f..ed148b44c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Project.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Project.java @@ -143,241 +143,81 @@ public String getUri() { return notNullState(links, "links").getSelf(); } - /** - * @return users URI string - * @deprecated use {@link #getUsersUri()} instead - */ - @Deprecated - @JsonIgnore - public String getUsersLink() { - return getUsersUri(); - } - @JsonIgnore public String getUsersUri() { return notNullState(links, "links").getUsers(); } - /** - * @return roles URI string - * @deprecated use {@link #getRolesUri()} instead - */ - @Deprecated - @JsonIgnore - public String getRolesLink() { - return getRolesUri(); - } - @JsonIgnore public String getRolesUri() { return notNullState(links, "links").getRoles(); } - /** - * @return groups URI string - * @deprecated use {@link #getGroupsUri()} instead - */ - @Deprecated - @JsonIgnore - public String getGroupsLink() { - return getGroupsUri(); - } - @JsonIgnore public String getGroupsUri() { return notNullState(links, "links").getGroups(); } - /** - * @return invitations URI string - * @deprecated use {@link #getInvitationsUri()} instead - */ - @Deprecated - @JsonIgnore - public String getInvitationsLink() { - return getInvitationsUri(); - } - @JsonIgnore public String getInvitationsUri() { return notNullState(links, "links").getInvitations(); } - /** - * @return LDM URI string - * @deprecated use {@link #getLdmUri()} instead - */ - @Deprecated - @JsonIgnore - public String getLdmLink() { - return getLdmUri(); - } - @JsonIgnore public String getLdmUri() { return links.getLdm(); } - /** - * @return LDM thumbnail URI string - * @deprecated use {@link #getLdmThumbnailUri()} instead - */ - @Deprecated - @JsonIgnore - public String getLdmThumbnailLink() { - return getLdmThumbnailUri(); - } - @JsonIgnore public String getLdmThumbnailUri() { return notNullState(links, "links").getLdmThumbnail(); } - /** - * @return metadata URI string - * @deprecated use {@link #getMetadataUri()} instead - */ - @Deprecated - @JsonIgnore - public String getMetadataLink() { - return getMetadataUri(); - } - @JsonIgnore public String getMetadataUri() { return notNullState(links, "links").getMetadata(); } - /** - * @return public artifacts URI string - * @deprecated use {@link #getPublicArtifactsUri()} instead - */ - @Deprecated - @JsonIgnore - public String getPublicArtifactsLink() { - return getPublicArtifactsUri(); - } - @JsonIgnore public String getPublicArtifactsUri() { return notNullState(links, "links").getPublicArtifacts(); } - /** - * @return templates URI string - * @deprecated use {@link #getTemplatesUri()} instead - */ - @Deprecated - @JsonIgnore - public String getTemplatesLink() { - return getTemplatesUri(); - } - @JsonIgnore public String getTemplatesUri() { return notNullState(links, "links").getTemplates(); } - /** - * @return connectors URI string - * @deprecated use {@link #getConnectorsUri()} instead - */ - @Deprecated - @JsonIgnore - public String getConnectorsLink() { - return getConnectorsUri(); - } - @JsonIgnore public String getConnectorsUri() { return notNullState(links, "links").getConnectors(); } - /** - * @return data load URI string - * @deprecated use {@link #getDataLoadUri()} instead - */ - @Deprecated - @JsonIgnore - public String getDataLoadLink() { - return getDataLoadUri(); - } - @JsonIgnore public String getDataLoadUri() { return notNullState(links, "links").getDataLoad(); } - /** - * @return schedules URI string - * @deprecated use {@link #getSchedulesUri()} instead - */ - @Deprecated - @JsonIgnore - public String getSchedulesLink() { - return getSchedulesUri(); - } - @JsonIgnore public String getSchedulesUri() { return notNullState(links, "links").getSchedules(); } - /** - * @return execute URI string - * @deprecated use {@link #getExecuteUri()} instead - */ - @Deprecated - @JsonIgnore - public String getExecuteLink() { - return getExecuteUri(); - } - @JsonIgnore public String getExecuteUri() { return notNullState(links, "links").getExecute(); } - /** - * @return event stores URI string - * @deprecated use {@link #getEventStoresUri()} instead - */ - @Deprecated - @JsonIgnore - public String getEventStoresLink() { - return getEventStoresUri(); - } - @JsonIgnore public String getEventStoresUri() { return notNullState(links, "links").getEventStores(); } - /** - * @return clear caches URI string - * @deprecated use {@link #getClearCachesUri()} instead - */ - @Deprecated - @JsonIgnore - public String getClearCachesLink() { - return getClearCachesUri(); - } - @JsonIgnore public String getClearCachesUri() { return notNullState(links, "links").getClearCaches(); } - /** - * @return uploads URI string - * @deprecated use {@link #getUploadsUri()} instead - */ - @Deprecated - @JsonIgnore - public String getUploadsLink() { - return getUploadsUri(); - } - @JsonIgnore public String getUploadsUri() { return notNullState(links, "links").getUploads(); diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultGdcTimeElParam.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultGdcTimeElParam.java index a7c10a6a4..a41a7b926 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultGdcTimeElParam.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultGdcTimeElParam.java @@ -32,15 +32,6 @@ public List getIds() { return ids; } - /** - * @return list of values - * @deprecated for backward compatibility only. Do not use this method, it always returns null. - */ - @Deprecated - public List getVals() { - return null; - } - @Override public boolean equals(final Object o) { if (this == o) return true; diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/MaqlDdlLinks.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/MaqlDdlLinks.java index 74e8406d0..3e3f41a5d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/MaqlDdlLinks.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/MaqlDdlLinks.java @@ -29,15 +29,6 @@ private MaqlDdlLinks(@JsonProperty("entries") List entries) { super(entries); } - /** - * @return status URI string - * @deprecated use {@link #getStatusUri()} instead - */ - @Deprecated - public String getStatusLink() { - return getStatusUri(); - } - public String getStatusUri() { for (LinkEntry linkEntry : getEntries()) { if (TASKS_STATUS.equals(linkEntry.getCategory())) { diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/report/ReportExportFormat.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/report/ReportExportFormat.java deleted file mode 100644 index d5d419069..000000000 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/report/ReportExportFormat.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved. - * This source code is licensed under the BSD-style license found in the - * LICENSE.txt file in the root directory of this source tree. - */ -package com.gooddata.sdk.model.report; - -import com.gooddata.sdk.model.export.ExportFormat; - -import static com.gooddata.util.Validate.notNull; - -/** - * Format of exported report - * - * @deprecated use {@link ExportFormat} - */ -@Deprecated -public enum ReportExportFormat { - - PDF, XLS, PNG, CSV, HTML, XLSX; - - public String getValue() { - return name().toLowerCase(); - } - - public static String[] arrayToStringArray(ReportExportFormat... formats) { - String[] fs = new String[formats.length]; - for (int i = 0; i < formats.length; i++) { - fs[i] = formats[i].getValue(); - } - return fs; - } - - public static ExportFormat toExportFormat(final ReportExportFormat format) { - notNull(format, "format"); - return ExportFormat.valueOf(format.name()); - } -} diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/warehouse/WarehouseTask.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/warehouse/WarehouseTask.java index d687f325e..52da7ac66 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/warehouse/WarehouseTask.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/warehouse/WarehouseTask.java @@ -32,29 +32,14 @@ private WarehouseTask(@JsonProperty("links") Map links) { this.links = links; } - @Deprecated - String getPollLink() { - return getPollUri(); - } - public String getPollUri() { return links.get(POLL_LINK); } - @Deprecated - String getWarehouseLink() { - return getWarehouseUri(); - } - public String getWarehouseUri() { return links.get(WAREHOUSE_LINK); } - @Deprecated - String getWarehouseUserLink() { - return getWarehouseUserUri(); - } - public String getWarehouseUserUri() { return links.get(WAREHOUSE_USER_LINK); } diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/warehouse/WarehouseUser.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/warehouse/WarehouseUser.java index bf65425c1..e5b31f330 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/warehouse/WarehouseUser.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/warehouse/WarehouseUser.java @@ -32,21 +32,6 @@ public class WarehouseUser { public static final String URI = WarehouseUsers.URI + "/{userId}"; public static final UriTemplate TEMPLATE = new UriTemplate(URI); - /** - * @deprecated in favour of {@link WarehouseUserRole#ADMIN} - */ - @Deprecated - public static final String ADMIN_ROLE = WarehouseUserRole.ADMIN.getRoleName(); - /** - * @deprecated in favour of {@link WarehouseUserRole#DATA_ADMIN} - */ - @Deprecated - public static final String DATA_ADMIN_ROLE = WarehouseUserRole.DATA_ADMIN.getRoleName(); - /** - * @deprecated in favour of {@link WarehouseUserRole#READ_ONLY} - */ - @Deprecated - public static final String READ_ONLY_ROLE = WarehouseUserRole.READ_ONLY.getRoleName(); private static final String SELF_LINK = "self"; diff --git a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/ArithmeticMeasureDefinitionTest.groovy b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/ArithmeticMeasureDefinitionTest.groovy index 74fb9dea7..fda4ce260 100644 --- a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/ArithmeticMeasureDefinitionTest.groovy +++ b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/ArithmeticMeasureDefinitionTest.groovy @@ -31,33 +31,11 @@ class ArithmeticMeasureDefinitionTest extends Specification { measure.getMeasureIdentifiers() == ["localIdentifier1", "localIdentifier2"] } - def "should throw when getting used object qualifier"() { - given: - ArithmeticMeasureDefinition measure = new ArithmeticMeasureDefinition(["localIdentifier1", "localIdentifier2"], "sum") - - when: - measure.getObjQualifier() - - then: - thrown(UnsupportedOperationException) - } - def "should return empty list when getting used object qualifiers"() { expect: new ArithmeticMeasureDefinition(["localIdentifier1", "localIdentifier2"], "sum").getObjQualifiers().isEmpty() } - def "should throw when calling withObjectUriQualifier"() { - given: - ArithmeticMeasureDefinition measure = new ArithmeticMeasureDefinition(["localIdentifier1", "localIdentifier2"], "sum") - - when: - measure.withObjUriQualifier(new UriObjQualifier("/gdc/md/a12332")) - - then: - thrown(UnsupportedOperationException) - } - def "should return same object when calling withObjUriQualifiers"() { setup: ArithmeticMeasureDefinition measure = new ArithmeticMeasureDefinition(["localIdentifier1", "localIdentifier2"], "sum") diff --git a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/OverPeriodMeasureDefinitionTest.groovy b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/OverPeriodMeasureDefinitionTest.groovy index d56028290..3c8ad0f3e 100644 --- a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/OverPeriodMeasureDefinitionTest.groovy +++ b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/OverPeriodMeasureDefinitionTest.groovy @@ -84,26 +84,6 @@ class OverPeriodMeasureDefinitionTest extends Specification { null | [new OverPeriodDateAttribute(new UriObjQualifier('/gdc/md/projectId/obj/1'), 2)] } - def "should throw when getting used object qualifiers via deprecated method"() { - when: - OverPeriodMeasureDefinition measure = new OverPeriodMeasureDefinition('mId', [ - new OverPeriodDateAttribute(new IdentifierObjQualifier('id1'), -2), - ]) - measure.getObjQualifier() - then: - thrown(UnsupportedOperationException) - } - - def "should throw when try to copy with uri via deprecated method"() { - when: - OverPeriodMeasureDefinition measure = new OverPeriodMeasureDefinition('mId', [ - new OverPeriodDateAttribute(new IdentifierObjQualifier('id1'), -2), - ]) - measure.withObjUriQualifier(new UriObjQualifier("/gdc/md/projectId/obj/1")) - then: - thrown(UnsupportedOperationException) - } - def "should copy with uri converter"() { when: OverPeriodMeasureDefinition measure = new OverPeriodMeasureDefinition('mId', [ diff --git a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/PopMeasureDefinitionTest.groovy b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/PopMeasureDefinitionTest.groovy index fe63ed066..c03641be6 100644 --- a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/PopMeasureDefinitionTest.groovy +++ b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/PopMeasureDefinitionTest.groovy @@ -33,20 +33,11 @@ class PopMeasureDefinitionTest extends Specification { then: measure.measureIdentifier == 'mId' measure.popAttribute.uri == '/gdc/md/projectId/obj/1' - measure.objQualifier.uri == '/gdc/md/projectId/obj/1' + measure.objQualifiers.first().uri == '/gdc/md/projectId/obj/1' measure.isAdHoc() measure.toString() } - def "should copy with uri"() { - when: - def measure = new PopMeasureDefinition("mid", new IdentifierObjQualifier("id")) - def copy = measure.withObjUriQualifier(new UriObjQualifier("uri")) - - then: - copy.objQualifier.uri == 'uri' - } - def "should copy with uri converter"() { when: def measure = new PopMeasureDefinition("mid", new IdentifierObjQualifier("id")) @@ -96,15 +87,6 @@ class PopMeasureDefinitionTest extends Specification { .verify() } - def "should return null when qualifier is requested but was not set"() { - when: - def definition = new PopMeasureDefinition("mid", null) - def qualifier = definition.getObjQualifier() - - then: - qualifier == null - } - def "should return empty collection when qualifiers are requested but none was set"() { when: def definition = new PopMeasureDefinition("mid", null) diff --git a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/PreviousPeriodMeasureDefinitionTest.groovy b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/PreviousPeriodMeasureDefinitionTest.groovy index b7a67d1e4..cbbc88d96 100644 --- a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/PreviousPeriodMeasureDefinitionTest.groovy +++ b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/PreviousPeriodMeasureDefinitionTest.groovy @@ -84,28 +84,6 @@ class PreviousPeriodMeasureDefinitionTest extends Specification { null | [new PreviousPeriodDateDataSet(new UriObjQualifier('/gdc/md/projectId/obj/1'), 2)] } - def "should throw when getting used object qualifiers via deprecated method"() { - when: - PreviousPeriodMeasureDefinition measure = new PreviousPeriodMeasureDefinition('mId', [ - new PreviousPeriodDateDataSet(new IdentifierObjQualifier('id1'), -2), - ]) - measure.getObjQualifier() - - then: - thrown(UnsupportedOperationException) - } - - def "should throw when try to copy with uri via deprecated method"() { - when: - PreviousPeriodMeasureDefinition measure = new PreviousPeriodMeasureDefinition('mId', [ - new PreviousPeriodDateDataSet(new IdentifierObjQualifier('id1'), -2), - ]) - measure.withObjUriQualifier(new UriObjQualifier("/gdc/md/projectId/obj/1")) - - then: - thrown(UnsupportedOperationException) - } - def "should copy with uri converter"() { when: PreviousPeriodMeasureDefinition measure = new PreviousPeriodMeasureDefinition('mId', [ diff --git a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/SimpleMeasureDefinitionTest.groovy b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/SimpleMeasureDefinitionTest.groovy index 5d621e55c..1d1aa5ba4 100644 --- a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/SimpleMeasureDefinitionTest.groovy +++ b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/afm/SimpleMeasureDefinitionTest.groovy @@ -55,9 +55,6 @@ class SimpleMeasureDefinitionTest extends Specification { with(definition?.item as UriObjQualifier) { uri == QUALIFIER.uri } - with(definition?.objQualifier as UriObjQualifier) { - uri == QUALIFIER.uri - } definition?.aggregation == 'avg' definition?.computeRatio with(definition?.filters?.find { it.class == PositiveAttributeFilter }) { @@ -103,16 +100,6 @@ class SimpleMeasureDefinitionTest extends Specification { definition.hasFilters() } - def "should copy with uri"() { - when: - def definition = new SimpleMeasureDefinition(new IdentifierObjQualifier("id")) - def copy = definition.withObjUriQualifier(new UriObjQualifier("uri")) - - then: - copy.getUri() == 'uri' - copy.getObjQualifier().getUri() == 'uri' - } - def "should copy with uri converter"() { when: def definition = new SimpleMeasureDefinition(new IdentifierObjQualifier("id")) @@ -164,15 +151,6 @@ class SimpleMeasureDefinitionTest extends Specification { .verify() } - def "should return null when qualifier is requested but was not set"() { - when: - def definition = new SimpleMeasureDefinition(null) - def qualifier = definition.getObjQualifier() - - then: - qualifier == null - } - def "should return empty collection when qualifiers are requested but none was set"() { when: def definition = new SimpleMeasureDefinition(null) diff --git a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/VisualizationObjectTest.groovy b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/VisualizationObjectTest.groovy index 739fc6351..4906ae54c 100644 --- a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/VisualizationObjectTest.groovy +++ b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/VisualizationObjectTest.groovy @@ -57,6 +57,7 @@ class VisualizationObjectTest extends Specification { complexVisualization?.referenceItems?.size() == 2 } + @SuppressWarnings("GrDeprecatedAPIUsage") def "should serialize full"() { given: VOSimpleMeasureDefinition measureDefinition = new VOSimpleMeasureDefinition(new UriObjQualifier("/uri/to/measure/1"), 'sum', false, diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/account/AccountTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/account/AccountTest.java index 169bb8601..5fe7b3261 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/account/AccountTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/account/AccountTest.java @@ -35,7 +35,6 @@ public void testDeserialize() throws Exception { assertThat(account.getLastName(), is(LAST_NAME)); assertThat(account.getId(), is("ID")); assertThat(account.getUri(), is("/gdc/account/profile/ID")); - assertThat(account.getProjectsLink(), is("/gdc/account/profile/ID/projects")); assertThat(account.getProjectsUri(), is("/gdc/account/profile/ID/projects")); assertThat(account.getIpWhitelist(), contains(IP)); } diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataload/processes/DataloadProcessTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataload/processes/DataloadProcessTest.java index 34474ea1b..67dbf51d6 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataload/processes/DataloadProcessTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataload/processes/DataloadProcessTest.java @@ -30,7 +30,6 @@ public void testDeserialization() throws Exception { assertThat(process.getExecutables(), hasSize(1)); assertThat(process.getId(), is("processId")); assertThat(process.getUri(), is("/gdc/projects/PROJECT_ID/dataload/processes/processId")); - assertThat(process.getExecutionsLink(), is("/gdc/projects/PROJECT_ID/dataload/processes/processId/executions")); assertThat(process.getExecutionsUri(), is("/gdc/projects/PROJECT_ID/dataload/processes/processId/executions")); assertThat(process.getSourceUri(), is("/gdc/projects/PROJECT_ID/dataload/processes/processId/source")); } diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionTaskTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionTaskTest.java index 22abbaa03..8ee88f807 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionTaskTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionTaskTest.java @@ -17,9 +17,7 @@ public class ProcessExecutionTaskTest { @Test public void testDeserialize() throws Exception { final ProcessExecutionTask task = readObjectFromResource("/dataload/processes/executionTask.json", ProcessExecutionTask.class); - assertThat(task.getPollLink(), is("/gdc/projects/PROJECT_ID/dataload/processes/processId/executions/executionId")); assertThat(task.getPollUri(), is("/gdc/projects/PROJECT_ID/dataload/processes/processId/executions/executionId")); - assertThat(task.getDetailLink(), is("/gdc/projects/PROJECT_ID/dataload/processes/processId/executions/executionId/detail")); assertThat(task.getDetailUri(), is("/gdc/projects/PROJECT_ID/dataload/processes/processId/executions/executionId/detail")); } } \ No newline at end of file diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataset/DatasetTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataset/DatasetTest.java deleted file mode 100644 index e33d777e0..000000000 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataset/DatasetTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved. - * This source code is licensed under the BSD-style license found in the - * LICENSE.txt file in the root directory of this source tree. - */ -package com.gooddata.sdk.model.dataset; - -import org.testng.annotations.Test; - -import static com.gooddata.util.ResourceUtils.readObjectFromResource; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; - -public class DatasetTest { - - @SuppressWarnings("deprecation") - @Test - public void deserialize() throws Exception { - final Dataset dataset = readObjectFromResource("/dataset/dataset.json", Dataset.class); - assertThat(dataset, is(notNullValue())); - - assertThat(dataset.getIdentifier(), is("dataset.person")); - assertThat(dataset.getTitle(), is("Person")); - assertThat(dataset.getUri(), is("/gdc/md/PROJECT_ID/ldm/singleloadinterface/dataset.person")); - } -} diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataset/DatasetsTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataset/DatasetsTest.java deleted file mode 100644 index 01e56315b..000000000 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/dataset/DatasetsTest.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved. - * This source code is licensed under the BSD-style license found in the - * LICENSE.txt file in the root directory of this source tree. - */ -package com.gooddata.sdk.model.dataset; - -import com.gooddata.sdk.model.gdc.AboutLinks.Link; -import org.testng.annotations.Test; - -import java.util.Collection; - -import static com.gooddata.util.ResourceUtils.readObjectFromResource; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasSize; - -public class DatasetsTest { - - @SuppressWarnings("deprecation") - @Test - public void deserialize() throws Exception { - final Datasets datasets = readObjectFromResource("/dataset/datasetLinks.json", Datasets.class); - assertThat(datasets, is(notNullValue())); - assertThat(datasets.getCategory(), is("singleloadinterface")); - assertThat(datasets.getInstance(), is("MD::LDM::SingleLoadInterface")); - assertThat(datasets.getSummary(), is("single loading interfaces")); - - final Collection links = datasets.getLinks(); - assertThat(links, is(notNullValue())); - assertThat(links, hasSize(1)); - - final Link link = links.iterator().next(); - assertThat(link, is(notNullValue())); - assertThat(link.getIdentifier(), is("dataset.person")); - assertThat(link.getUri(), is("/gdc/md/PROJECT_ID/ldm/singleloadinterface/dataset.person")); - assertThat(link.getCategory(), is("dataset-singleloadinterface")); - assertThat(link.getTitle(), is("Person")); - assertThat(link.getSummary(), is("dataset single data loading interface specifications")); - } -} diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/export/ExportFormatTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/export/ExportFormatTest.java index cc6116e9c..1ff85c6fc 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/export/ExportFormatTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/export/ExportFormatTest.java @@ -8,19 +8,13 @@ import org.testng.annotations.Test; import static com.gooddata.sdk.model.export.ExportFormat.arrayToStringArray; -import static com.gooddata.sdk.model.report.ReportExportFormat.toExportFormat; import static com.shazam.shazamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.arrayContaining; public class ExportFormatTest { - @Test(expectedExceptions = IllegalArgumentException.class) - public void shouldFailOnNullInput() throws Exception { - toExportFormat(null); - } - @Test - public void shouldConvert() throws Exception { + public void shouldConvert() { assertThat(arrayToStringArray(ExportFormat.CSV, ExportFormat.PDF), arrayContaining("csv", "pdf")); } } \ No newline at end of file diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/gdc/GdcTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/gdc/GdcTest.java deleted file mode 100644 index b2dcc0685..000000000 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/gdc/GdcTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved. - * This source code is licensed under the BSD-style license found in the - * LICENSE.txt file in the root directory of this source tree. - */ -package com.gooddata.sdk.model.gdc; - -import org.testng.annotations.Test; - -import static com.gooddata.util.ResourceUtils.readObjectFromResource; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; - -public class GdcTest { - - @SuppressWarnings("deprecation") - @Test - public void deserialize() throws Exception { - final Gdc gdc = readObjectFromResource("/gdc/gdc.json", Gdc.class); - assertThat(gdc, is(notNullValue())); - - assertThat(gdc.getHomeLink(), is("/gdc/")); - assertThat(gdc.getHomeUri(), is("/gdc/")); - assertThat(gdc.getTokenLink(), is("/gdc/account/token")); - assertThat(gdc.getTokenUri(), is("/gdc/account/token")); - assertThat(gdc.getLoginLink(), is("/gdc/account/login")); - assertThat(gdc.getLoginUri(), is("/gdc/account/login")); - assertThat(gdc.getMetadataLink(), is("/gdc/md")); - assertThat(gdc.getMetadataUri(), is("/gdc/md")); - assertThat(gdc.getXTabLink(), is("/gdc/xtab2")); - assertThat(gdc.getXTabUri(), is("/gdc/xtab2")); - assertThat(gdc.getAvailableElementsLink(), is("/gdc/availableelements")); - assertThat(gdc.getAvailableElementsUri(), is("/gdc/availableelements")); - assertThat(gdc.getReportExporterLink(), is("/gdc/exporter")); - assertThat(gdc.getReportExporterUri(), is("/gdc/exporter")); - assertThat(gdc.getAccountLink(), is("/gdc/account")); - assertThat(gdc.getAccountUri(), is("/gdc/account")); - assertThat(gdc.getProjectsLink(), is("/gdc/projects")); - assertThat(gdc.getProjectsUri(), is("/gdc/projects")); - assertThat(gdc.getToolLink(), is("/gdc/tool")); - assertThat(gdc.getToolUri(), is("/gdc/tool")); - assertThat(gdc.getTemplatesLink(), is("/gdc/templates")); - assertThat(gdc.getTemplatesUri(), is("/gdc/templates")); - assertThat(gdc.getReleaseInfoLink(), is("/gdc/releaseInfo")); - assertThat(gdc.getReleaseInfoUri(), is("/gdc/releaseInfo")); - assertThat(gdc.getUserStagingLink(), is("/uploads")); - assertThat(gdc.getUserStagingUri(), is("/uploads")); - } -} \ No newline at end of file diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/gdc/LinkEntriesTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/gdc/LinkEntriesTest.java index 87d6a2d57..64e487d4c 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/gdc/LinkEntriesTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/gdc/LinkEntriesTest.java @@ -24,7 +24,6 @@ public void testDeserialization() throws Exception { assertThat(linkEntries, is(notNullValue())); assertThat(linkEntries.getEntries(), hasSize(1)); assertThat(linkEntries.getEntries().get(0), is(notNullValue())); - assertThat(linkEntries.getEntries().get(0).getLink(), is("URI")); assertThat(linkEntries.getEntries().get(0).getUri(), is("URI")); assertThat(linkEntries.getEntries().get(0).getCategory(), is("tasks-status")); } diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/gdc/RootLinksTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/gdc/RootLinksTest.java index 835837da2..0c1d4af7d 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/gdc/RootLinksTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/gdc/RootLinksTest.java @@ -14,37 +14,23 @@ public class RootLinksTest { - @SuppressWarnings("deprecation") @Test - public void deserialize() throws Exception { + public void deserialize() { final RootLinks rootLinks = readObjectFromResource("/gdc/gdc.json", RootLinks.class); assertThat(rootLinks, is(notNullValue())); - assertThat(rootLinks.getHomeLink(), is("/gdc/")); assertThat(rootLinks.getHomeUri(), is("/gdc/")); - assertThat(rootLinks.getTokenLink(), is("/gdc/account/token")); assertThat(rootLinks.getTokenUri(), is("/gdc/account/token")); - assertThat(rootLinks.getLoginLink(), is("/gdc/account/login")); assertThat(rootLinks.getLoginUri(), is("/gdc/account/login")); - assertThat(rootLinks.getMetadataLink(), is("/gdc/md")); assertThat(rootLinks.getMetadataUri(), is("/gdc/md")); - assertThat(rootLinks.getXTabLink(), is("/gdc/xtab2")); assertThat(rootLinks.getXTabUri(), is("/gdc/xtab2")); - assertThat(rootLinks.getAvailableElementsLink(), is("/gdc/availableelements")); assertThat(rootLinks.getAvailableElementsUri(), is("/gdc/availableelements")); - assertThat(rootLinks.getReportExporterLink(), is("/gdc/exporter")); assertThat(rootLinks.getReportExporterUri(), is("/gdc/exporter")); - assertThat(rootLinks.getAccountLink(), is("/gdc/account")); assertThat(rootLinks.getAccountUri(), is("/gdc/account")); - assertThat(rootLinks.getProjectsLink(), is("/gdc/projects")); assertThat(rootLinks.getProjectsUri(), is("/gdc/projects")); - assertThat(rootLinks.getToolLink(), is("/gdc/tool")); assertThat(rootLinks.getToolUri(), is("/gdc/tool")); - assertThat(rootLinks.getTemplatesLink(), is("/gdc/templates")); assertThat(rootLinks.getTemplatesUri(), is("/gdc/templates")); - assertThat(rootLinks.getReleaseInfoLink(), is("/gdc/releaseInfo")); assertThat(rootLinks.getReleaseInfoUri(), is("/gdc/releaseInfo")); - assertThat(rootLinks.getUserStagingLink(), is("/uploads")); assertThat(rootLinks.getUserStagingUri(), is("/uploads")); } } \ No newline at end of file diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/AttributeDisplayFormTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/AttributeDisplayFormTest.java index e107ab704..052c57c0d 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/AttributeDisplayFormTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/AttributeDisplayFormTest.java @@ -27,7 +27,6 @@ public class AttributeDisplayFormTest { private static final String ELEMENTS_LINK = "/gdc/md/PROJECT_ID/obj/DF_ID/elements"; private static final String TITLE = "Person Name"; - @SuppressWarnings("deprecation") @Test public void shouldDeserialize() throws Exception { final AttributeDisplayForm attrDF = readObjectFromResource("/md/attributeDisplayForm.json", AttributeDisplayForm.class); @@ -38,7 +37,6 @@ public void shouldDeserialize() throws Exception { assertThat(attrDF.isDefault(), is(DEFAULT_TRUE)); assertThat(attrDF.getLdmExpression(), is(LDM_EXPRESSION)); assertThat(attrDF.getType(), is(TYPE)); - assertThat(attrDF.getElementsLink(), is(ELEMENTS_LINK)); assertThat(attrDF.getElementsUri(), is(ELEMENTS_LINK)); } diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/AttributeTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/AttributeTest.java index c7fd3a4a6..b0d312961 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/AttributeTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/AttributeTest.java @@ -22,7 +22,6 @@ public class AttributeTest { public static final String TITLE = "Person ID"; - @SuppressWarnings("deprecation") @Test public void shouldDeserialize() throws Exception { final Attribute attribute = readObjectFromResource("/md/attribute.json", Attribute.class); @@ -58,7 +57,6 @@ public void shouldDeserialize() throws Exception { assertThat(foreignKeys.iterator().next(), is(Matchers.notNullValue())); assertThat(attribute.hasDimension(), is(true)); - assertThat(attribute.getDimensionLink(), is("/gdc/md/PROJECT_ID/obj/DIM_ID")); assertThat(attribute.getDimensionUri(), is("/gdc/md/PROJECT_ID/obj/DIM_ID")); assertThat(attribute.getDirection(), is("asc")); @@ -67,7 +65,6 @@ public void shouldDeserialize() throws Exception { assertThat(attribute.isSortedByUsedDf(), is(false)); assertThat(attribute.isSortedByLinkedDf(), is(false)); assertThat(attribute.getType(), is("GDC.time.date")); - assertThat(attribute.getLinkedDisplayFormLink(), is("/gdc/md/PROJECT_ID/obj/DF_LINK")); assertThat(attribute.getLinkedDisplayFormUri(), is("/gdc/md/PROJECT_ID/obj/DF_LINK")); assertThat(attribute.getCompositeAttribute(), hasSize(0)); assertThat(attribute.getCompositeAttributePk(), hasSize(0)); diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/DatasetTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/DatasetTest.java index 412fc8814..db18c4d81 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/DatasetTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/DatasetTest.java @@ -22,7 +22,6 @@ public class DatasetTest { - @SuppressWarnings("deprecation") @Test public void shouldDeserialize() throws Exception { final Dataset dataset = readObjectFromResource("/md/dataset.json", Dataset.class); @@ -47,10 +46,8 @@ public void shouldDeserialize() throws Exception { assertThat(attributes, is(notNullValue())); assertThat(attributes, hasSize(3)); - assertThat(dataset.getDataUploadsLink(), is("/gdc/md/PROJECT_ID/data/uploads/688536")); assertThat(dataset.getDataUploadsUri(), is("/gdc/md/PROJECT_ID/data/uploads/688536")); assertThat(dataset.hasUploadConfiguration(), is(false)); - assertThat(dataset.getUploadConfigurationLink(), is(nullValue())); assertThat(dataset.getUploadConfigurationUri(), is(nullValue())); } diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/DisplayFormTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/DisplayFormTest.java index 5b5be3a27..72f33c813 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/DisplayFormTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/DisplayFormTest.java @@ -24,7 +24,6 @@ public class DisplayFormTest { public static final String LDM_EXPRESSION = ""; private static final String ELEMENTS_LINK = "/gdc/md/PROJECT_ID/obj/DF_ID/elements"; - @SuppressWarnings("deprecation") @Test public void shouldDeserialize() throws Exception { final DisplayForm displayForm = readObjectFromResource("/md/displayForm.json", DisplayForm.class); @@ -34,7 +33,6 @@ public void shouldDeserialize() throws Exception { assertThat(displayForm.getExpression(), is(EXPRESSION)); assertThat(displayForm.getLdmExpression(), is(LDM_EXPRESSION)); assertThat(displayForm.getType(), is(nullValue())); - assertThat(displayForm.getElementsLink(), is(ELEMENTS_LINK)); assertThat(displayForm.getElementsUri(), is(ELEMENTS_LINK)); } diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/EntryTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/EntryTest.java index 9dd603b42..1a0935fd7 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/EntryTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/EntryTest.java @@ -37,13 +37,11 @@ public class EntryTest { public static final boolean LOCKED = true; public static final boolean UNLISTED = false; - @SuppressWarnings("deprecation") @Test - public void testDeserialize() throws Exception { + public void testDeserialize() { final Entry entry = readObjectFromResource("/md/entry.json", Entry.class); assertThat(entry, is(notNullValue())); assertThat(entry.getId(), is(OBJ_ID)); - assertThat(entry.getLink(), is(URI)); assertThat(entry.getUri(), is(URI)); assertThat(entry.getTitle(), is(TITLE)); assertThat(entry.getSummary(), is(SUMMARY)); diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/MetaTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/MetaTest.java index 7d078138d..af1fd29eb 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/MetaTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/MetaTest.java @@ -63,13 +63,13 @@ public void testDeserialization() throws Exception { assertThat(meta.isUnlisted(), is(UNLISTED)); assertThat(meta.isProduction(), is(PRODUCTION)); assertThat(meta.isSharedWithSomeone(), is(SHARED_WITH_SOMEONE)); - assertThat(meta.getFlags(), nullValue()); + assertThat(meta.getFlags(), is(FLAGS)); } @Test public void testSerialization() throws Exception { final Meta meta = new Meta(AUTHOR, CONTRIBUTOR, CREATED, UPDATED, SUMMARY, TITLE, CATEGORY, TAGS, URI, IDENTIFIER, - DEPRECATED, PRODUCTION, LOCKED, UNLISTED, SHARED_WITH_SOMEONE); + DEPRECATED, PRODUCTION, LOCKED, UNLISTED, SHARED_WITH_SOMEONE, FLAGS); assertThat(meta, jsonEquals(resource("md/meta.json"))); } @@ -100,7 +100,7 @@ public void testToStringFormat() { @Test public void testSerializable() throws Exception { final Meta meta = new Meta(AUTHOR, CONTRIBUTOR, CREATED, UPDATED, SUMMARY, TITLE, CATEGORY, TAGS, URI, IDENTIFIER, - DEPRECATED, PRODUCTION, LOCKED, UNLISTED, SHARED_WITH_SOMEONE); + DEPRECATED, PRODUCTION, LOCKED, UNLISTED, SHARED_WITH_SOMEONE, FLAGS); final Meta deserialized = SerializationUtils.roundtrip(meta); assertThat(deserialized, jsonEquals(meta)); diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/NestedAttributeTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/NestedAttributeTest.java index 3e28590a7..db94548f3 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/NestedAttributeTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/NestedAttributeTest.java @@ -22,7 +22,6 @@ public class NestedAttributeTest { - @SuppressWarnings("deprecation") @Test public void testDeserialization() throws Exception { final NestedAttribute attribute = readObjectFromResource("/md/dimensionAttribute.json", NestedAttribute.class); @@ -57,7 +56,6 @@ public void testDeserialization() throws Exception { assertThat(foreignKeys.iterator().next(), is(Matchers.notNullValue())); assertThat(attribute.hasDimension(), is(true)); - assertThat(attribute.getDimensionLink(), is("/gdc/md/PROJECT_ID/obj/DIM_ID")); assertThat(attribute.getDimensionUri(), is("/gdc/md/PROJECT_ID/obj/DIM_ID")); } diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/report/GridTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/report/GridTest.java index d3252e15e..3fc9f7867 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/report/GridTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/report/GridTest.java @@ -5,6 +5,7 @@ */ package com.gooddata.sdk.model.md.report; +import com.gooddata.sdk.model.md.Metric; import org.apache.commons.lang3.SerializationUtils; import org.hamcrest.CoreMatchers; import org.testng.annotations.Test; @@ -53,7 +54,6 @@ public void testDeserialization() throws Exception { @Test - @SuppressWarnings("deprecation") public void testSerialization() throws Exception { final Map colWidths = new HashMap<>(); final Map> sort = new HashMap<>(); @@ -63,7 +63,7 @@ public void testSerialization() throws Exception { final Grid grid = new Grid( asList(METRIC_GROUP), asList(new AttributeInGrid("/gdc/md/PROJECT_ID/obj/ATTR_ID", "attr")), - asList(new MetricElement("/gdc/md/PROJECT_ID/obj/METR_ID", "metr")), + asList(new MetricElement(readObjectFromResource("/md/metric-out.json", Metric.class), "metr")), sort, asList(colWidths) ); diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/project/ProjectTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/project/ProjectTest.java index 603d5058b..0baf3d4f2 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/project/ProjectTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/project/ProjectTest.java @@ -21,7 +21,6 @@ public class ProjectTest { - @SuppressWarnings("deprecation") @Test public void testDeserialize() throws Exception { final Project project = readObjectFromResource("/project/project.json", Project.class); @@ -42,37 +41,22 @@ public void testDeserialize() throws Exception { assertThat(project.getCreated(), is(new DateTime(2014, 4, 11, 11, 43, 45, DateTimeZone.UTC))); assertThat(project.getUpdated(), is(new DateTime(2014, 4, 11, 11, 43, 47, DateTimeZone.UTC))); - assertThat(project.getLdmThumbnailLink(), is("/gdc/projects/PROJECT_ID/ldm?thumbnail=1")); assertThat(project.getLdmThumbnailUri(), is("/gdc/projects/PROJECT_ID/ldm?thumbnail=1")); assertThat(project.getUri(), is("/gdc/projects/PROJECT_ID")); - assertThat(project.getClearCachesLink(), is("/gdc/projects/PROJECT_ID/clearCaches")); assertThat(project.getClearCachesUri(), is("/gdc/projects/PROJECT_ID/clearCaches")); - assertThat(project.getInvitationsLink(), is("/gdc/projects/PROJECT_ID/invitations")); assertThat(project.getInvitationsUri(), is("/gdc/projects/PROJECT_ID/invitations")); - assertThat(project.getUsersLink(), is("/gdc/projects/PROJECT_ID/users?link=1")); assertThat(project.getUsersUri(), is("/gdc/projects/PROJECT_ID/users?link=1")); - assertThat(project.getGroupsLink(), is("/gdc/projects/PROJECT_ID/groups")); assertThat(project.getGroupsUri(), is("/gdc/projects/PROJECT_ID/groups")); - assertThat(project.getUploadsLink(), is("https://ea-di.staging.getgooddata.com/project-uploads/PROJECT_ID/")); assertThat(project.getUploadsUri(), is("https://ea-di.staging.getgooddata.com/project-uploads/PROJECT_ID/")); - assertThat(project.getLdmLink(), is("/gdc/projects/PROJECT_ID/ldm")); assertThat(project.getLdmUri(), is("/gdc/projects/PROJECT_ID/ldm")); - assertThat(project.getMetadataLink(), is("/gdc/md/PROJECT_ID")); assertThat(project.getMetadataUri(), is("/gdc/md/PROJECT_ID")); - assertThat(project.getPublicArtifactsLink(), is("/gdc/projects/PROJECT_ID/publicartifacts")); assertThat(project.getPublicArtifactsUri(), is("/gdc/projects/PROJECT_ID/publicartifacts")); - assertThat(project.getRolesLink(), is("/gdc/projects/PROJECT_ID/roles")); assertThat(project.getRolesUri(), is("/gdc/projects/PROJECT_ID/roles")); - assertThat(project.getDataLoadLink(), is("/gdc/projects/PROJECT_ID/dataload")); assertThat(project.getDataLoadUri(), is("/gdc/projects/PROJECT_ID/dataload")); - assertThat(project.getConnectorsLink(), is("/gdc/projects/PROJECT_ID/connectors")); assertThat(project.getConnectorsUri(), is("/gdc/projects/PROJECT_ID/connectors")); - assertThat(project.getExecuteLink(), is("/gdc/projects/PROJECT_ID/execute")); assertThat(project.getExecuteUri(), is("/gdc/projects/PROJECT_ID/execute")); - assertThat(project.getSchedulesLink(), is("/gdc/projects/PROJECT_ID/schedules")); assertThat(project.getSchedulesUri(), is("/gdc/projects/PROJECT_ID/schedules")); - assertThat(project.getTemplatesLink(), is("/gdc/md/PROJECT_ID/templates")); - assertThat(project.getEventStoresLink(), is("/gdc/projects/PROJECT_ID/dataload/eventstore/stores")); + assertThat(project.getTemplatesUri(), is("/gdc/md/PROJECT_ID/templates")); assertThat(project.getEventStoresUri(), is("/gdc/projects/PROJECT_ID/dataload/eventstore/stores")); } diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/project/model/MaqlDdlLinksTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/project/model/MaqlDdlLinksTest.java index a424f1e4b..fc58325eb 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/project/model/MaqlDdlLinksTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/project/model/MaqlDdlLinksTest.java @@ -20,7 +20,6 @@ public void testDeserialization() throws Exception { final MaqlDdlLinks maqlDdlLinks = readObjectFromResource("/model/maqlDdlLinks.json", MaqlDdlLinks.class); assertThat(maqlDdlLinks, is(notNullValue())); - assertThat(maqlDdlLinks.getStatusLink(), is("/gdc/md/PROJECT_ID/tasks/123/status")); assertThat(maqlDdlLinks.getStatusUri(), is("/gdc/md/PROJECT_ID/tasks/123/status")); } } \ No newline at end of file diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/report/ReportExportFormatTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/report/ReportExportFormatTest.java deleted file mode 100644 index c7a765ea9..000000000 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/report/ReportExportFormatTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved. - * This source code is licensed under the BSD-style license found in the - * LICENSE.txt file in the root directory of this source tree. - */ -package com.gooddata.sdk.model.report; - -import org.testng.annotations.Test; - -import java.util.Arrays; - -import static com.gooddata.sdk.model.report.ReportExportFormat.toExportFormat; - -@SuppressWarnings("deprecation") -public class ReportExportFormatTest { - - @Test(expectedExceptions = IllegalArgumentException.class) - public void shouldFailOnNullInput() throws Exception { - toExportFormat(null); - } - - @Test - public void shouldConvertAllValues() throws Exception { - Arrays.stream(ReportExportFormat.values()) - .forEach(ReportExportFormat::toExportFormat); - } -} \ No newline at end of file diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/warehouse/WarehouseTaskTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/warehouse/WarehouseTaskTest.java index dff1950f1..4a5ccb39c 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/warehouse/WarehouseTaskTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/warehouse/WarehouseTaskTest.java @@ -17,7 +17,6 @@ public class WarehouseTaskTest { @Test public void testDeserializePoll() throws Exception { final WarehouseTask warehouseTask = readObjectFromResource("/warehouse/warehouseTask-poll.json", WarehouseTask.class); - assertThat(warehouseTask.getPollLink(), is("/gdc/datawarehouse/executions/executionId")); assertThat(warehouseTask.getPollUri(), is("/gdc/datawarehouse/executions/executionId")); } @@ -25,7 +24,6 @@ public void testDeserializePoll() throws Exception { @Test public void testDeserializeInstance() throws Exception { final WarehouseTask warehouseTask = readObjectFromResource("/warehouse/warehouseTask-finished.json", WarehouseTask.class); - assertThat(warehouseTask.getWarehouseLink(), is("/gdc/datawarehouse/instances/instanceId")); assertThat(warehouseTask.getWarehouseUri(), is("/gdc/datawarehouse/instances/instanceId")); } diff --git a/gooddata-java-model/src/test/resources/md/meta.json b/gooddata-java-model/src/test/resources/md/meta.json index f0c288d75..65c7e8513 100644 --- a/gooddata-java-model/src/test/resources/md/meta.json +++ b/gooddata-java-model/src/test/resources/md/meta.json @@ -13,5 +13,6 @@ "locked": 0, "unlisted": 1, "isProduction": 1, - "sharedWithSomeone": 0 + "sharedWithSomeone": 0, + "flags": ["preloaded", "strictAccessControl"] } diff --git a/gooddata-java-model/src/test/resources/md/report/grid-input.json b/gooddata-java-model/src/test/resources/md/report/grid-input.json index c2a5d6240..e873b2ec0 100644 --- a/gooddata-java-model/src/test/resources/md/report/grid-input.json +++ b/gooddata-java-model/src/test/resources/md/report/grid-input.json @@ -14,7 +14,7 @@ "metrics": [ { "alias": "metr", - "uri": "/gdc/md/PROJECT_ID/obj/METR_ID" + "uri": "/gdc/md/PROJECT_ID/obj/47" } ], "rows": [ diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/AbstractService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/AbstractService.java index e9a93afbc..eb9c9be67 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/AbstractService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/AbstractService.java @@ -51,18 +51,6 @@ public AbstractService(final RestTemplate restTemplate, final GoodDataSettings s this.settings = notNull(settings, "settings"); } - /** - * Sets RESTful HTTP Spring template. Should be called from constructor of concrete service extending - * this abstract one. - * - * @param restTemplate RESTful HTTP Spring template - * @deprecated use {@link #AbstractService(RestTemplate, GoodDataSettings)} - */ - @Deprecated - public AbstractService(RestTemplate restTemplate) { - this(restTemplate, new GoodDataSettings()); - } - final R poll(final PollHandler handler, long timeout, final TimeUnit unit) { notNull(handler, "handler"); final long start = System.currentTimeMillis(); diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/GoodData.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/GoodData.java index d2e4ee57d..c24493ba1 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/GoodData.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/GoodData.java @@ -28,7 +28,6 @@ import com.gooddata.sdk.service.md.MetadataService; import com.gooddata.sdk.service.project.model.ModelService; import com.gooddata.sdk.service.project.ProjectService; -import com.gooddata.sdk.service.report.ReportService; import org.apache.commons.lang3.StringUtils; import org.apache.http.client.HttpClient; import org.apache.http.client.config.RequestConfig; @@ -49,7 +48,6 @@ import static com.gooddata.util.Validate.notNull; import static java.util.Arrays.asList; -import static java.util.Collections.singletonList; import static org.apache.http.util.VersionInfo.loadVersionInfo; /** @@ -67,12 +65,6 @@ */ public class GoodData { - /** - * @deprecated use {@link Header#GDC_REQUEST_ID} instead. - */ - @Deprecated - public static final String GDC_REQUEST_ID_HEADER = Header.GDC_REQUEST_ID; - protected static final String PROTOCOL = GoodDataEndpoint.PROTOCOL; protected static final int PORT = GoodDataEndpoint.PORT; protected static final String HOSTNAME = GoodDataEndpoint.HOSTNAME; @@ -87,8 +79,6 @@ public class GoodData { private final GdcService gdcService; private final DataStoreService dataStoreService; private final DatasetService datasetService; - @SuppressWarnings("deprecation") - private final ReportService reportService; private final ConnectorService connectorService; private final ProcessService processService; private final WarehouseService warehouseService; @@ -227,7 +217,6 @@ protected GoodData(GoodDataEndpoint endpoint, Authentication authentication, Goo dataStoreService = new DataStoreService(getHttpClient(), getRestTemplate(), gdcService, endpoint.toUri()); datasetService = new DatasetService(getRestTemplate(), dataStoreService, settings); exportService = new ExportService(getRestTemplate(), endpoint, settings); - reportService = new ReportService(exportService, getRestTemplate(), settings); processService = new ProcessService(getRestTemplate(), accountService, dataStoreService, settings); warehouseService = new WarehouseService(getRestTemplate(), settings); connectorService = new ConnectorService(getRestTemplate(), projectService, settings); @@ -401,17 +390,6 @@ public DatasetService getDatasetService() { return datasetService; } - /** - * Get initialized service for report management (to execute and export report, ...) - * - * @return initialized service for report management - */ - @Bean - @SuppressWarnings("deprecation") - public ReportService getReportService() { - return reportService; - } - /** * Get initialized service for exports management (export report,...) * diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/account/AccountService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/account/AccountService.java index 1f7ccd6a0..812818df7 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/account/AccountService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/account/AccountService.java @@ -34,17 +34,6 @@ public AccountService(final RestTemplate restTemplate, final GoodDataSettings se super(restTemplate, settings); } - /** - * Constructs service for GoodData account management. - * - * @param restTemplate RESTful HTTP Spring template - * @deprecated use AccountService(RestTemplate, GoodDataSettings) constructor instead - */ - @Deprecated - public AccountService(final RestTemplate restTemplate) { - super(restTemplate); - } - /** * Gets current account of logged user. * diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/auditevent/AuditEventService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/auditevent/AuditEventService.java index faf8d1718..06462fc61 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/auditevent/AuditEventService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/auditevent/AuditEventService.java @@ -42,18 +42,6 @@ public AuditEventService(final RestTemplate restTemplate, final AccountService a this.accountService = notNull(accountService, "account service"); } - /** - * Service for audit events - * @param restTemplate rest template - * @param accountService account service - * @deprecated use AuditEventService(RestTemplate, AccountService, GoodDataSettings) constructor instead - */ - @Deprecated - public AuditEventService(final RestTemplate restTemplate, final AccountService accountService) { - super(restTemplate); - this.accountService = notNull(accountService, "account service"); - } - /** * Get list of audit events for the given domain id * @param domainId domain id diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/connector/ConnectorService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/connector/ConnectorService.java index 3d1f8f3f0..ee4e49853 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/connector/ConnectorService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/connector/ConnectorService.java @@ -42,15 +42,6 @@ public ConnectorService(final RestTemplate restTemplate, final ProjectService pr this.projectService = notNull(projectService, "projectService"); } - /** - * @deprecated use ConnectorService(RestTemplate, ProjectService, GoodDataSettings) constructor instead - */ - @Deprecated - public ConnectorService(final RestTemplate restTemplate, final ProjectService projectService) { - super(restTemplate); - this.projectService = notNull(projectService, "projectService"); - } - /** * Retrieve connector integration * diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/dataload/OutputStageService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/dataload/OutputStageService.java index 5de061825..2c6eb09fe 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/dataload/OutputStageService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/dataload/OutputStageService.java @@ -37,17 +37,6 @@ public OutputStageService(final RestTemplate restTemplate, final GoodDataSetting super(restTemplate, settings); } - /** - * Sets RESTful HTTP Spring template. Should be called from constructor of concrete service extending - * this abstract one. - * @param restTemplate RESTful HTTP Spring template - * @deprecated use OutputStageService(RestTemplate, GoodDataSettings) constructor instead - */ - @Deprecated - public OutputStageService(final RestTemplate restTemplate) { - super(restTemplate); - } - /** * Get output stage by given URI. * @param uri output stage uri diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/dataload/processes/ProcessService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/dataload/processes/ProcessService.java index a89b1566b..a2d1ea6eb 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/dataload/processes/ProcessService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/dataload/processes/ProcessService.java @@ -75,22 +75,6 @@ public ProcessService(final RestTemplate restTemplate, final AccountService acco this.accountService = notNull(accountService, "accountService"); } - /** - * Sets RESTful HTTP Spring template. Should be called from constructor of concrete service extending - * this abstract one. - * @param restTemplate RESTful HTTP Spring template - * @param accountService service to access accounts - * @param dataStoreService service for upload process data - * @deprecated use ProcessService(RestTemplate, AccountService, DataStoreService, GoodDataSettings) instead - */ - @Deprecated - public ProcessService(final RestTemplate restTemplate, final AccountService accountService, - final DataStoreService dataStoreService) { - super(restTemplate); - this.dataStoreService = dataStoreService; - this.accountService = notNull(accountService, "accountService"); - } - /** * Create new process with given data by given project. * Process must have null path to prevent clashes with deploying from appstore. @@ -140,21 +124,6 @@ public FutureResult createProcessFromAppstore(Project project, return postProcess(process, getProcessesUri(project), HttpMethod.POST); } - /** - * Update process with given data by given project. - * Process must have null path to prevent clashes with deploying from appstore. - * - * @param project project to which the process belongs - * @param process to create - * @param processData process data to upload - * @return updated process - * @deprecated use {@link #updateProcess(DataloadProcess, File)} - */ - @Deprecated - public DataloadProcess updateProcess(Project project, DataloadProcess process, File processData) { - return updateProcess(process, processData); - } - /** * Update process with given data by given project. * Process must have null path to prevent clashes with deploying from appstore. @@ -171,24 +140,6 @@ public DataloadProcess updateProcess(DataloadProcess process, File processData) return postProcess(process, processData, URI.create(process.getUri())); } - /** - * Update process with data from appstore by given project. - * Process must have set path field to valid appstore path in order to deploy from appstore. - * This method is asynchronous, because when deploying from appstore, deployment worker can be triggered. - * - * @param project project to which the process belongs - * @param process to update - * @return updated process - * @deprecated use {@link #updateProcessFromAppstore(DataloadProcess)} - */ - @Deprecated - public FutureResult updateProcessFromAppstore(Project project, DataloadProcess process) { - notNull(project, "project"); - notNull(process, "process"); - notEmpty(process.getPath(), "process path"); - return postProcess(process, getProcessUri(project, process.getId()), HttpMethod.PUT); - } - /** * Update process with data from appstore by given project. * Process must have set path field to valid appstore path in order to deploy from appstore. @@ -374,20 +325,6 @@ public Schedule createSchedule(Project project, Schedule schedule) { return postSchedule(schedule, getSchedulesUri(project)); } - /** - * Update the given schedule - * - * @param project project - * @param schedule to update - * @return updated Schedule - * @throws ScheduleNotFoundException when the schedule doesn't exist - * @deprecated use {@link #updateSchedule(Schedule)} - */ - @Deprecated - public Schedule updateSchedule(final Project project, Schedule schedule) { - return updateSchedule(schedule); - } - /** * Update the given schedule * diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/dataset/DatasetService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/dataset/DatasetService.java index abc1d0eee..afccdecb4 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/dataset/DatasetService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/dataset/DatasetService.java @@ -31,9 +31,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.Collection; -import java.util.HashSet; import java.util.List; -import java.util.stream.Collectors; import static com.gooddata.util.Validate.notEmpty; import static com.gooddata.util.Validate.notNull; @@ -59,15 +57,6 @@ public DatasetService(final RestTemplate restTemplate, final DataStoreService da this.dataStoreService = notNull(dataStoreService, "dataStoreService"); } - /** - * @deprecated use DatasetService(RestTemplate, DataStoreService, GoodDataSettings) constructor instead - */ - @Deprecated - public DatasetService(final RestTemplate restTemplate, final DataStoreService dataStoreService) { - super(restTemplate); - this.dataStoreService = notNull(dataStoreService, "dataStoreService"); - } - /** * Obtains manifest from given project by given datasetId * @@ -219,18 +208,6 @@ protected void onFinish() { }); } - /** - * Lists datasets (links) in project. Returns empty list in case there are no datasets. - * - * @param project project to list datasets in - * @return collection of dataset links or empty list - * @deprecated use {@link #listDatasetLinks(Project)} instead - */ - @Deprecated - public Collection listDatasets(Project project) { - return listDatasetLinks(project).stream().map(link -> new Dataset(link.getIdentifier(), link.getUri(), link.getTitle())).collect(Collectors.toCollection(HashSet::new)); - } - /** * Lists datasets (links) in project. Returns empty list in case there are no datasets. * diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/executeafm/ExecuteAfmService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/executeafm/ExecuteAfmService.java index e837ae88b..39a659019 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/executeafm/ExecuteAfmService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/executeafm/ExecuteAfmService.java @@ -49,14 +49,6 @@ public ExecuteAfmService(final RestTemplate restTemplate, final GoodDataSettings super(restTemplate, settings); } - /** - * @deprecated use {@link ExecuteAfmService#executeAfm(Project, Execution)} - */ - @Deprecated - public ExecutionResponse execute(final Project project, final Execution execution) { - return executeAfm(project, execution); - } - /** * Executes the given AFM execution returning the execution response * @param project project of the execution diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/export/ExportException.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/export/ExportException.java index 492389fdb..2bec53b15 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/export/ExportException.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/export/ExportException.java @@ -5,13 +5,13 @@ */ package com.gooddata.sdk.service.export; -import com.gooddata.sdk.service.report.ReportException; +import com.gooddata.GoodDataException; /** * Exception during export */ @SuppressWarnings("deprecation") -public class ExportException extends ReportException { +public class ExportException extends GoodDataException { public ExportException(String message) { super(message); diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/export/ExportService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/export/ExportService.java index e0bedea31..5df02b475 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/export/ExportService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/export/ExportService.java @@ -24,7 +24,6 @@ import com.gooddata.sdk.model.md.report.Report; import com.gooddata.sdk.model.md.report.ReportDefinition; import com.gooddata.sdk.model.project.Project; -import com.gooddata.sdk.service.report.ReportService; import org.springframework.http.HttpEntity; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; @@ -42,7 +41,6 @@ /** * Export project data * - * @see ReportService */ public class ExportService extends AbstractService { @@ -65,18 +63,6 @@ public ExportService(final RestTemplate restTemplate, final GoodDataEndpoint end this.endpoint = notNull(endpoint, "endpoint"); } - /** - * Service for data export - * @param restTemplate REST template - * @param endpoint GoodData Endpoint - * @deprecated use ExportService(RestTemplate, GoodDataEndpoint, GoodDataSettings) constructor instead - */ - @Deprecated - public ExportService(final RestTemplate restTemplate, final GoodDataEndpoint endpoint) { - super(restTemplate); - this.endpoint = notNull(endpoint, "endpoint"); - } - /** * Export the given report definition in the given format to the given output stream * diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/export/NoDataExportException.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/export/NoDataExportException.java index 5c451c0b7..60d274082 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/export/NoDataExportException.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/export/NoDataExportException.java @@ -5,13 +5,12 @@ */ package com.gooddata.sdk.service.export; -import com.gooddata.sdk.service.report.NoDataReportException; +import com.gooddata.GoodDataException; /** * Thrown when report export contains no data */ -@SuppressWarnings("deprecation") -public class NoDataExportException extends NoDataReportException { +public class NoDataExportException extends GoodDataException { public NoDataExportException() { this("Export contains no data"); diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/featureflag/FeatureFlagService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/featureflag/FeatureFlagService.java index 635212aa0..7b4ae9e30 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/featureflag/FeatureFlagService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/featureflag/FeatureFlagService.java @@ -36,17 +36,6 @@ public FeatureFlagService(final RestTemplate restTemplate, final GoodDataSetting super(restTemplate, settings); } - /** - * Constructs service for GoodData feature flags management. - * - * @param restTemplate RESTful HTTP Spring template - * @deprecated use FeatureFlagService(RestTemplate, GoodDataSettings) constructor instead - */ - @Deprecated - public FeatureFlagService(final RestTemplate restTemplate) { - super(restTemplate); - } - /** * Returns aggregated feature flags for given project and current user (aggregates global, project group, project * and user feature flags). diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/gdc/DataStoreService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/gdc/DataStoreService.java index 5d006de69..2362c157d 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/gdc/DataStoreService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/gdc/DataStoreService.java @@ -211,12 +211,18 @@ public void close() throws IOException { // nothing to close - wrappedClient doesn't have to implement CloseableHttpClient } + /** + * @deprecated because supertype's {@link HttpClient#getParams()} is deprecated. + */ @Override @Deprecated public HttpParams getParams() { return client.getParams(); } + /** + * @deprecated because supertype's {@link HttpClient#getConnectionManager()} is deprecated. + */ @Override @Deprecated public ClientConnectionManager getConnectionManager() { diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/gdc/GdcService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/gdc/GdcService.java index e18c476ea..444d9d368 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/gdc/GdcService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/gdc/GdcService.java @@ -8,7 +8,6 @@ import com.gooddata.sdk.service.AbstractService; import com.gooddata.GoodDataException; import com.gooddata.sdk.service.GoodDataSettings; -import com.gooddata.sdk.model.gdc.Gdc; import com.gooddata.sdk.model.gdc.RootLinks; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; @@ -22,29 +21,6 @@ public GdcService(final RestTemplate restTemplate, final GoodDataSettings settin super(restTemplate, settings); } - /** - * @deprecated use GdcService(RestTemplate, GoodDataSettings) constructor instead - */ - @Deprecated - public GdcService(final RestTemplate restTemplate) { - super(restTemplate); - } - - /** - * Obtains GoodData API root links. - * - * @return GoodData API root links - * @deprecated use {@link #getRootLinks()} instead - */ - @Deprecated - public Gdc getGdc() { - try { - return restTemplate.getForObject(Gdc.URI, Gdc.class); - } catch (GoodDataException | RestClientException e) { - throw new GoodDataException("Unable to get gdc about", e); - } - } - /** * Obtains GoodData API root links. * diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/md/MetadataService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/md/MetadataService.java index c432a4596..02017dab4 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/md/MetadataService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/md/MetadataService.java @@ -41,14 +41,6 @@ public MetadataService(final RestTemplate restTemplate, final GoodDataSettings s super(restTemplate, settings); } - /** - * @deprecated use MetadataService(RestTemplate, GoodDataSettings) constructor instead - */ - @Deprecated - public MetadataService(final RestTemplate restTemplate) { - super(restTemplate); - } - /** * Create metadata object in given project * diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/md/maintenance/ExportImportService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/md/maintenance/ExportImportService.java index f20c13a25..53a8051f2 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/md/maintenance/ExportImportService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/md/maintenance/ExportImportService.java @@ -31,14 +31,6 @@ public ExportImportService(final RestTemplate restTemplate, final GoodDataSettin super(restTemplate, settings); } - /** - * @deprecated use ExportImportService(RestTemplate, GoodDataSettings) constructor instead - */ - @Deprecated - public ExportImportService(final RestTemplate restTemplate) { - super(restTemplate); - } - /** * Exports partial metadata from project and returns token identifying this export * diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/notification/NotificationService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/notification/NotificationService.java index 9f1d9b0df..2595a9c3b 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/notification/NotificationService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/notification/NotificationService.java @@ -29,14 +29,6 @@ public NotificationService(final RestTemplate restTemplate, final GoodDataSettin super(restTemplate, settings); } - /** - * @deprecated use NotificationService(RestTemplate, GoodDataSettings) constructor instead - */ - @Deprecated - public NotificationService(final RestTemplate restTemplate) { - super(restTemplate); - } - /** * Triggers given project event. * diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/project/ProjectService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/project/ProjectService.java index 1f549d107..da2daa0c7 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/project/ProjectService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/project/ProjectService.java @@ -67,18 +67,6 @@ public ProjectService(final RestTemplate restTemplate, final AccountService acco this.accountService = notNull(accountService, "accountService"); } - /** - * Constructs service for GoodData project management (list projects, create a project, ...). - * @param restTemplate RESTful HTTP Spring template - * @param accountService GoodData account service - * @deprecated use ProjectService(RestTemplate, AccountService) constructor instead - */ - @Deprecated - public ProjectService(final RestTemplate restTemplate, final AccountService accountService) { - super(restTemplate); - this.accountService = notNull(accountService, "accountService"); - } - /** * Get all projects current user has access to. * diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/project/model/ModelService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/project/model/ModelService.java index 9156d769d..19db37a30 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/project/model/ModelService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/project/model/ModelService.java @@ -44,14 +44,6 @@ public ModelService(final RestTemplate restTemplate, final GoodDataSettings sett super(restTemplate, settings); } - /** - * @deprecated use ModelService(RestTemplate, GoodDataSettings) constructor instead - */ - @Deprecated - public ModelService(final RestTemplate restTemplate) { - super(restTemplate); - } - private FutureResult getProjectModelDiff(Project project, DiffRequest diffRequest) { notNull(project, "project"); notNull(project.getId(), "project.id"); diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/projecttemplate/ProjectTemplateService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/projecttemplate/ProjectTemplateService.java index 3389d679c..6cd1b22c0 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/projecttemplate/ProjectTemplateService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/projecttemplate/ProjectTemplateService.java @@ -37,18 +37,6 @@ public ProjectTemplateService(final RestTemplate restTemplate, final GoodDataSet super(restTemplate, settings); } - /** - * Sets RESTful HTTP Spring template. Should be called from constructor of concrete service extending - * this abstract one. - * - * @param restTemplate RESTful HTTP Spring template - * @deprecated use ProjectTemplateService(RestTemplate) constructor instead - */ - @Deprecated - public ProjectTemplateService(final RestTemplate restTemplate) { - super(restTemplate); - } - /** * List of all projects' templates * @return list of templates diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/report/NoDataReportException.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/report/NoDataReportException.java deleted file mode 100644 index f08c834f6..000000000 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/report/NoDataReportException.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved. - * This source code is licensed under the BSD-style license found in the - * LICENSE.txt file in the root directory of this source tree. - */ -package com.gooddata.sdk.service.report; - -import com.gooddata.sdk.service.export.NoDataExportException; - -/** - * Thrown when export contains no data - * @deprecated use {@link NoDataExportException} - */ -@SuppressWarnings("deprecation") -@Deprecated -public class NoDataReportException extends ReportException { - - public NoDataReportException() { - this("Report contains no data"); - } - - public NoDataReportException(final String message) { - super(message); - } - -} diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/report/ReportException.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/report/ReportException.java deleted file mode 100644 index 0728b048b..000000000 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/report/ReportException.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved. - * This source code is licensed under the BSD-style license found in the - * LICENSE.txt file in the root directory of this source tree. - */ -package com.gooddata.sdk.service.report; - -import com.gooddata.GoodDataException; -import com.gooddata.sdk.service.export.ExportException; - -/** - * Exception during report export - * @deprecated use {@link ExportException} - */ -@Deprecated -public class ReportException extends GoodDataException { - public ReportException(String message) { - super(message); - } - - public ReportException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/report/ReportService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/report/ReportService.java deleted file mode 100644 index 5e4a985fc..000000000 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/report/ReportService.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved. - * This source code is licensed under the BSD-style license found in the - * LICENSE.txt file in the root directory of this source tree. - */ -package com.gooddata.sdk.service.report; - -import com.gooddata.sdk.service.AbstractService; -import com.gooddata.sdk.service.FutureResult; -import com.gooddata.sdk.service.GoodDataSettings; -import com.gooddata.sdk.service.export.ExportService; -import com.gooddata.sdk.model.export.ExportFormat; -import com.gooddata.sdk.model.md.report.Report; -import com.gooddata.sdk.model.md.report.ReportDefinition; -import com.gooddata.sdk.model.report.ReportExportFormat; -import org.springframework.web.client.RestTemplate; - -import java.io.OutputStream; - -import static com.gooddata.sdk.model.report.ReportExportFormat.toExportFormat; -import static com.gooddata.util.Validate.notNull; - -/** - * Service for report export - * @deprecated use {@link ExportService} - */ -@Deprecated -public class ReportService extends AbstractService { - - /** - * @deprecated user {@link ExportService#EXPORTING_URI} - */ - @Deprecated - public static final String EXPORTING_URI = ExportService.EXPORTING_URI; - - private final ExportService service; - - public ReportService(final ExportService service, final RestTemplate restTemplate, final GoodDataSettings settings) { - super(restTemplate, settings); - this.service = notNull(service, "service"); - } - - /** - * @deprecated use ReportService(ExportService, RestTemplate, GoodDataSettings) constructor instead - */ - @Deprecated - public ReportService(final ExportService service, final RestTemplate restTemplate) { - super(restTemplate); - this.service = notNull(service, "service"); - } - - /** - * Export the given report definition in the given format to the given output stream - * @param reportDefinition report definition - * @param format export format - * @param output target - * @return polling result - * @throws NoDataReportException in case report contains no data - * @throws ReportException on error - * @deprecated use {@link ExportService#export(ReportDefinition, ExportFormat, OutputStream)} - */ - @Deprecated - public FutureResult exportReport(final ReportDefinition reportDefinition, final ReportExportFormat format, - final OutputStream output) { - return service.export(reportDefinition, toExportFormat(format), output); - } - - /** - * Export the given report in the given format to the given output stream - * @param report report - * @param format export format - * @param output target - * @return polling result - * @throws NoDataReportException in case report contains no data - * @throws ReportException on error - * @deprecated use {@link ExportService#export(Report, ExportFormat, OutputStream)} - */ - @Deprecated - public FutureResult exportReport(final Report report, final ReportExportFormat format, - final OutputStream output) { - return service.export(report, toExportFormat(format), output); - } - -} diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/warehouse/WarehouseService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/warehouse/WarehouseService.java index 3033a6bde..5f64db777 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/warehouse/WarehouseService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/warehouse/WarehouseService.java @@ -48,18 +48,6 @@ public WarehouseService(final RestTemplate restTemplate, final GoodDataSettings super(restTemplate, settings); } - /** - * Sets RESTful HTTP Spring template. Should be called from constructor of concrete service extending - * this abstract one. - * - * @param restTemplate RESTful HTTP Spring template - * @deprecated use WarehouseService(RestTemplate, GoodDataSettings) constructor instead - */ - @Deprecated - public WarehouseService(final RestTemplate restTemplate) { - super(restTemplate); - } - /** * Create new warehouse. * diff --git a/gooddata-java/src/test/java/com/gooddata/sdk/service/PollHandlerIT.java b/gooddata-java/src/test/java/com/gooddata/sdk/service/PollHandlerIT.java index 2c83c5ddb..aa1a7e57a 100644 --- a/gooddata-java/src/test/java/com/gooddata/sdk/service/PollHandlerIT.java +++ b/gooddata-java/src/test/java/com/gooddata/sdk/service/PollHandlerIT.java @@ -41,8 +41,8 @@ public void shouldPollOnEncodedUri() throws Exception { private static class PollingService extends AbstractService { - PollingService(final RestTemplate restTemplate) { - super(restTemplate); + private PollingService(final RestTemplate restTemplate) { + super(restTemplate, new GoodDataSettings()); } FutureResult test(final String uri) { diff --git a/gooddata-java/src/test/java/com/gooddata/sdk/service/dataset/DatasetServiceIT.java b/gooddata-java/src/test/java/com/gooddata/sdk/service/dataset/DatasetServiceIT.java index a49f0199a..1df85942f 100644 --- a/gooddata-java/src/test/java/com/gooddata/sdk/service/dataset/DatasetServiceIT.java +++ b/gooddata-java/src/test/java/com/gooddata/sdk/service/dataset/DatasetServiceIT.java @@ -140,22 +140,6 @@ public void shouldGetDatasetManifest() throws Exception { assertThat(manifest, is(notNullValue())); } - @SuppressWarnings("deprecation") - @Test - public void shouldListDatasets() throws Exception { - onRequest() - .havingMethodEqualTo("GET") - .havingPathEqualTo("/gdc/md/PROJECT_ID/ldm/singleloadinterface") - .respond() - .withBody(readFromResource("/dataset/datasetLinks.json")) - ; - - final Collection datasets = gd.getDatasetService().listDatasets(project); - assertThat(datasets, hasSize(1)); - assertThat(datasets.iterator().next().getUri(), - is("/gdc/md/PROJECT_ID/ldm/singleloadinterface/dataset.person")); - } - @Test public void shouldListDatasetLinks() throws Exception { onRequest() diff --git a/gooddata-java/src/test/java/com/gooddata/sdk/service/dataset/DatasetServiceTest.java b/gooddata-java/src/test/java/com/gooddata/sdk/service/dataset/DatasetServiceTest.java index afddeae0f..c939b7f1e 100644 --- a/gooddata-java/src/test/java/com/gooddata/sdk/service/dataset/DatasetServiceTest.java +++ b/gooddata-java/src/test/java/com/gooddata/sdk/service/dataset/DatasetServiceTest.java @@ -23,11 +23,9 @@ import java.io.IOException; import java.io.InputStream; -import java.util.Collection; import static com.gooddata.util.ResourceUtils.OBJECT_MAPPER; import static java.lang.String.format; -import static java.util.Collections.singletonList; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -49,8 +47,6 @@ public class DatasetServiceTest { @Mock private Project project; @Mock - private Link datasetLink; - @Mock private DatasetManifest manifest; @Mock private InputStream stream; @@ -145,41 +141,6 @@ public void testLoadDatasetByIdWithNullInputStream() { service.loadDataset(project, DATASET_ID, null); } - @SuppressWarnings("deprecation") - @Test(expectedExceptions = IllegalArgumentException.class) - public void testListDatasetsWithNullProject() { - service.listDatasets(null); - } - - @SuppressWarnings("deprecation") - @Test(expectedExceptions = GoodDataException.class) - public void testListDatasetsWithNullResponse() { - when(restTemplate.getForObject(Datasets.URI, Link.class, PROJECT_ID)).thenReturn(null); - service.listDatasets(project); - } - - @SuppressWarnings("deprecation") - @Test(expectedExceptions = GoodDataException.class) - public void testListDatasetsWithRestClientError() { - when(restTemplate.getForObject(Datasets.URI, Link.class, PROJECT_ID)).thenThrow(new RestClientException("")); - service.listDatasets(project); - } - - @SuppressWarnings("deprecation") - @Test - public void testListDatasetsWithEmptyResponse() { - final DatasetLinks datasets = mock(DatasetLinks.class); - when(restTemplate.getForObject(DatasetLinks.URI, DatasetLinks.class, PROJECT_ID)).thenReturn(datasets); - when(datasets.getLinks()).thenReturn(singletonList(datasetLink)); - when(datasetLink.getIdentifier()).thenReturn("ID"); - - final Collection result = service.listDatasets(project); - assertThat(result, hasSize(1)); - final Dataset dataset = result.iterator().next(); - assertThat(dataset, is(notNullValue())); - assertThat(dataset.getIdentifier(), is("ID")); - } - @Test(expectedExceptions = IllegalArgumentException.class) public void testListDatasetLinksWithNullProject() { service.listDatasetLinks(null); diff --git a/gooddata-java/src/test/java/com/gooddata/sdk/service/gdc/GdcServiceIT.java b/gooddata-java/src/test/java/com/gooddata/sdk/service/gdc/GdcServiceIT.java index 32ecd1f46..a8d76b463 100644 --- a/gooddata-java/src/test/java/com/gooddata/sdk/service/gdc/GdcServiceIT.java +++ b/gooddata-java/src/test/java/com/gooddata/sdk/service/gdc/GdcServiceIT.java @@ -6,7 +6,6 @@ package com.gooddata.sdk.service.gdc; import com.gooddata.sdk.service.AbstractGoodDataIT; -import com.gooddata.sdk.model.gdc.Gdc; import com.gooddata.sdk.model.gdc.RootLinks; import org.testng.annotations.Test; @@ -18,21 +17,6 @@ public class GdcServiceIT extends AbstractGoodDataIT { - @SuppressWarnings("deprecation") - @Test - public void shouldReturnGdc() throws Exception { - onRequest() - .havingMethodEqualTo("GET") - .havingPathEqualTo("/gdc") - .respond() - .withBody(readFromResource("/gdc/gdc.json")) - .withStatus(200); - - final Gdc gdc = gd.getGdcService().getGdc(); - assertThat(gdc, is(notNullValue())); - assertThat(gdc.getUserStagingUri(), is("/uploads")); - } - @Test public void shouldReturnRootLinks() throws Exception { onRequest() diff --git a/gooddata-java/src/test/java/com/gooddata/sdk/service/report/ReportServiceTest.java b/gooddata-java/src/test/java/com/gooddata/sdk/service/report/ReportServiceTest.java deleted file mode 100644 index add63cf08..000000000 --- a/gooddata-java/src/test/java/com/gooddata/sdk/service/report/ReportServiceTest.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved. - * This source code is licensed under the BSD-style license found in the - * LICENSE.txt file in the root directory of this source tree. - */ -package com.gooddata.sdk.service.report; - -import com.gooddata.sdk.model.report.ReportExportFormat; -import com.gooddata.sdk.service.GoodDataSettings; -import com.gooddata.sdk.model.export.ExportFormat; -import com.gooddata.sdk.service.export.ExportService; -import com.gooddata.sdk.model.md.report.Report; -import com.gooddata.sdk.model.md.report.ReportDefinition; -import org.springframework.web.client.RestTemplate; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - -@SuppressWarnings("deprecation") -public class ReportServiceTest { - - private ReportService reportService; - private ExportService exportService; - - @BeforeMethod - public void setUp() throws Exception { - exportService = mock(ExportService.class); - reportService = new ReportService(exportService, new RestTemplate(), new GoodDataSettings()); - } - - @Test(expectedExceptions = IllegalArgumentException.class) - public void shouldFailOnNullArgument() throws Exception { - new ReportService(null, mock(RestTemplate.class), new GoodDataSettings()); - } - - @Test - public void shouldExportReport() throws Exception { - final Report report = mock(Report.class); - - reportService.exportReport(report, ReportExportFormat.CSV, null); - - verify(exportService).export(eq(report), eq(ExportFormat.CSV), any()); - } - - @Test - public void shouldExportReportDefinition() throws Exception { - final ReportDefinition definition = mock(ReportDefinition.class); - - reportService.exportReport(definition, ReportExportFormat.CSV, null); - - verify(exportService).export(eq(definition), eq(ExportFormat.CSV), any()); - } -} \ No newline at end of file From 93ee4c14a818eafda2e525fa391c1e6ed92f69fd Mon Sep 17 00:00:00 2001 From: Libor Rysavy Date: Wed, 20 Feb 2019 16:28:06 +0100 Subject: [PATCH 2/2] Remove usages of deprecated APIs --- .../afm/DerivedMeasureDefinition.java | 1 + .../executeafm/afm/MeasureDefinition.java | 2 +- .../sdk/model/featureflag/FeatureFlags.java | 19 +++------ .../gooddata/sdk/model/md/AttributeSort.java | 4 +- .../md/report/GridElementDeserializer.java | 6 ++- .../sdk/model/md/visualization/Measure.java | 2 + .../md/visualization/VisualizationObject.java | 5 ++- .../model/md/visualization/BucketTest.groovy | 1 + .../model/md/visualization/MeasureTest.groovy | 1 + .../VisualizationConverterTest.groovy | 1 + .../model/featureflag/FeatureFlagsTest.java | 14 +++---- .../featureflag/ProjectFeatureFlagsTest.java | 6 +-- .../sdk/model/md/AttributeSortTest.java | 12 ++++-- .../sdk/model/md/NestedAttributeTest.java | 6 +-- .../report/GridElementDeserializerTest.java | 12 ++++++ .../sdk/service/gdc/DataStoreService.java | 18 ++++----- .../dataload/processes/ProcessServiceAT.java | 8 ++-- .../executeafm/ExecuteAfmServiceAT.java | 1 + .../sdk/service/gdc/DataStoreServiceIT.java | 3 +- .../sdk/service/md/ExportImportServiceAT.java | 2 +- .../sdk/service/md/MetadataServiceTest.java | 2 +- .../sdk/service/project/ProjectServiceAT.java | 40 ++++++++----------- .../service/project/ProjectServiceTest.java | 2 +- .../service/warehouse/WarehouseServiceAT.java | 32 ++++++--------- 24 files changed, 104 insertions(+), 96 deletions(-) diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/DerivedMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/DerivedMeasureDefinition.java index ca9c93158..e9a611b34 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/DerivedMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/DerivedMeasureDefinition.java @@ -16,6 +16,7 @@ /** * The superclass of the {@link MeasureDefinition} classes that are derived from the master measure and have the identifier of the master measure. */ +@SuppressWarnings("deprecation") @JsonTypeInfo(include = JsonTypeInfo.As.WRAPPER_OBJECT, use = JsonTypeInfo.Id.NAME) @JsonSubTypes({ @JsonSubTypes.Type(value = PopMeasureDefinition.class, name = PopMeasureDefinition.NAME), diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureDefinition.java index 839c842fc..76489c3ee 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureDefinition.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.gooddata.sdk.model.executeafm.IdentifierObjQualifier; import com.gooddata.sdk.model.executeafm.ObjQualifier; -import com.gooddata.sdk.model.executeafm.UriObjQualifier; import com.gooddata.sdk.model.md.visualization.VOPopMeasureDefinition; import com.gooddata.sdk.model.md.visualization.VOSimpleMeasureDefinition; import com.gooddata.sdk.model.md.Metric; @@ -18,6 +17,7 @@ import java.io.Serializable; import java.util.Collection; +@SuppressWarnings("deprecation") @JsonTypeInfo(include = JsonTypeInfo.As.WRAPPER_OBJECT, use = JsonTypeInfo.Id.NAME) @JsonSubTypes({ @JsonSubTypes.Type(value = SimpleMeasureDefinition.class, name = SimpleMeasureDefinition.NAME), diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/FeatureFlags.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/FeatureFlags.java index 36b84e72c..5107435f1 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/FeatureFlags.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/FeatureFlags.java @@ -5,23 +5,15 @@ */ package com.gooddata.sdk.model.featureflag; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.*; import com.gooddata.util.GoodDataToStringBuilder; import org.springframework.web.util.UriTemplate; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import static com.gooddata.util.Validate.notEmpty; +import static com.gooddata.util.Validate.notNull; import static java.util.stream.Collectors.toMap; -import static org.springframework.util.Assert.notNull; @JsonTypeInfo(include = JsonTypeInfo.As.WRAPPER_OBJECT, use = JsonTypeInfo.Id.NAME) @JsonTypeName("featureFlags") @@ -36,12 +28,12 @@ public class FeatureFlags implements Iterable { /** * Adds the feature flag of given name and given value. * - * @param name feature flag name + * @param name feature flag name * @param enabled feature flag value (enabled / disabled) */ @JsonAnySetter public void addFlag(final String name, final boolean enabled) { - notNull(name); + notNull(name, "name"); featureFlags.add(new FeatureFlag(name, enabled)); } @@ -56,6 +48,7 @@ public void removeFlag(final String flagName) { /** * Converts feature flags to map where flags' names are the keys and values are flags' enabled property + * * @return feature flags as map */ @JsonAnyGetter diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeSort.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeSort.java index 4aeab2986..44540db7e 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeSort.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeSort.java @@ -69,8 +69,8 @@ public AttributeSort deserialize(JsonParser p, DeserializationContext ctxt) thro } else if (root.isObject()) { return new AttributeSort(root.findValue("uri").textValue(), true); } else { - throw ctxt.mappingException("Only textual or object node expected but %s node found", - root.getNodeType().name()); + return (AttributeSort) ctxt.handleUnexpectedToken(AttributeSort.class, root.asToken(), p, + "Only textual or object node expected but %s node found", root.getNodeType().name()); } } } diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElementDeserializer.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElementDeserializer.java index 5785e908a..a992f4ea3 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElementDeserializer.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElementDeserializer.java @@ -26,12 +26,14 @@ public GridElement deserialize(JsonParser jp, DeserializationContext ctxt) throw if (MetricGroup.equals(textValue)) { return METRIC_GROUP; } else { - throw ctxt.mappingException("Unknown string representation of GridElement: %s", textValue); + return (GridElement) ctxt.handleWeirdStringValue(GridElement.class, textValue, + "Unknown string representation of GridElement: %s", textValue); } case START_OBJECT: return ctxt.readValue(jp, AttributeInGrid.class); default: - throw ctxt.mappingException("Unknown type of GridElement"); + return (GridElement) ctxt.handleUnexpectedToken(GridElement.class, jp.currentToken(), jp, + "Unknown type of GridElement"); } } } diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/Measure.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/Measure.java index 33813ab84..b165dbac2 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/Measure.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/Measure.java @@ -55,6 +55,7 @@ public Measure(@JsonProperty("definition") final MeasureDefinition definition, /** * @return true if measure definition has compute ratio set to true, false otherwise */ + @SuppressWarnings("deprecation") @JsonIgnore public boolean hasComputeRatio() { return getDefinition() instanceof VOSimpleMeasureDefinition && ((VOSimpleMeasureDefinition) getDefinition()).hasComputeRatio(); @@ -77,6 +78,7 @@ public void setTitle(String title) { /** * @return true if measure contains {@link VOPopMeasureDefinition}, false otherwise */ + @SuppressWarnings("deprecation") @JsonIgnore public boolean isPop() { return getDefinition() instanceof VOPopMeasureDefinition; diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationObject.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationObject.java index ae6384059..8ff1d5891 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationObject.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationObject.java @@ -93,6 +93,7 @@ public Measure getMeasure(final String localIdentifier) { /** * @return all measures from all buckets whose measure definition is instance of {@link VOSimpleMeasureDefinition} */ + @SuppressWarnings("deprecation") @JsonIgnore public List getSimpleMeasures() { return getMeasures().stream() @@ -224,7 +225,7 @@ public List getFilters() { } /** - * @param filters replacing previsous visualization object's filters + * @param filters replacing previous visualization object's filters */ @JsonIgnore public void setFilters(List filters) { @@ -264,7 +265,7 @@ public void setReferenceItems(Map referenceItems) { } /** - * @return uri to visualizaton class wrapped as {@link UriObjQualifier} + * @return uri to visualization class wrapped as {@link UriObjQualifier} */ @JsonIgnore public UriObjQualifier getVisualizationClass() { diff --git a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/BucketTest.groovy b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/BucketTest.groovy index 3a2384c1c..9d40d48ef 100644 --- a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/BucketTest.groovy +++ b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/BucketTest.groovy @@ -32,6 +32,7 @@ class BucketTest extends Specification { that new Bucket("noItems", new ArrayList()), jsonEquals(noItemsBucket) } + @SuppressWarnings("GrDeprecatedAPIUsage") def "should serialize full"() { expect: that new Bucket("attributeBucket", [ diff --git a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/MeasureTest.groovy b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/MeasureTest.groovy index 9cef11da4..fdc0d9e2d 100644 --- a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/MeasureTest.groovy +++ b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/MeasureTest.groovy @@ -66,6 +66,7 @@ class MeasureTest extends Specification { that deserialized, jsonEquals(measureWithCr) } + @SuppressWarnings("GrDeprecatedAPIUsage") def "test serialize simple"() { expect: that new Measure(new VOSimpleMeasureDefinition(new UriObjQualifier('uri')), 'loc1'), jsonEquals(resource(SIMPLE_MEASURE_JSON)) diff --git a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/VisualizationConverterTest.groovy b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/VisualizationConverterTest.groovy index 15c85ac43..7edb0cc24 100644 --- a/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/VisualizationConverterTest.groovy +++ b/gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/md/visualization/VisualizationConverterTest.groovy @@ -44,6 +44,7 @@ class VisualizationConverterTest extends Specification { private static final String STACKED_COLUMN_CHART = "md/visualization/stackedColumnChart.json" private static final String LINE_CHART = "md/visualization/lineChart.json" + @SuppressWarnings("GrDeprecatedAPIUsage") def "should convert complex"() { given: Afm expected = new Afm( diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/featureflag/FeatureFlagsTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/featureflag/FeatureFlagsTest.java index a8d8b1f57..e8b0998f8 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/featureflag/FeatureFlagsTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/featureflag/FeatureFlagsTest.java @@ -13,7 +13,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.isOneOf; +import static org.hamcrest.Matchers.oneOf; import static org.hamcrest.text.MatchesPattern.matchesPattern; import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertNotNull; @@ -40,17 +40,17 @@ public void testSerialize() { } @Test - public void shouldIterateThroughFlagsInForeach() throws Exception { + public void shouldIterateThroughFlagsInForeach() { final FeatureFlags flags = readObjectFromResource(getClass(), "/featureflag/featureFlags.json", FeatureFlags.class); for (FeatureFlag flag : flags) { - assertThat(flag, isOneOf( + assertThat(flag, is(oneOf( new FeatureFlag("testFeature", true), - new FeatureFlag("testFeature2", false))); + new FeatureFlag("testFeature2", false)))); } } @Test - public void isEnabledShouldReturnCorrectBoolean() throws Exception { + public void isEnabledShouldReturnCorrectBoolean() { final FeatureFlags flags = new FeatureFlags(); flags.addFlag("enabledFlag", true); flags.addFlag("disabledFlag", false); @@ -61,13 +61,13 @@ public void isEnabledShouldReturnCorrectBoolean() throws Exception { } @Test(expectedExceptions = IllegalArgumentException.class) - public void whenNullNameThenIsEnabledShouldThrow() throws Exception { + public void whenNullNameThenIsEnabledShouldThrow() { final FeatureFlags flags = new FeatureFlags(); flags.isEnabled(null); } @Test - public void testRemoveFlag() throws Exception { + public void testRemoveFlag() { final FeatureFlags flags = new FeatureFlags(); flags.addFlag("enabledFlag", true); diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/featureflag/ProjectFeatureFlagsTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/featureflag/ProjectFeatureFlagsTest.java index ceb4db6dc..7029e29fa 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/featureflag/ProjectFeatureFlagsTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/featureflag/ProjectFeatureFlagsTest.java @@ -16,7 +16,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.isOneOf; +import static org.hamcrest.Matchers.oneOf; import static org.hamcrest.core.StringContains.containsString; import static org.hamcrest.core.StringStartsWith.startsWith; import static org.testng.AssertJUnit.assertNotNull; @@ -53,10 +53,10 @@ public void shouldIterateThroughFlagsInForeach() throws Exception { final ProjectFeatureFlags flags = readObjectFromResource(getClass(), "/featureflag/projectFeatureFlags.json", ProjectFeatureFlags.class); for (ProjectFeatureFlag flag : flags) { - assertThat(flag, isOneOf( + assertThat(flag, is(oneOf( new ProjectFeatureFlag("myCoolFeature", true), new ProjectFeatureFlag("mySuperCoolFeature", true), - new ProjectFeatureFlag("mySuperSecretFeature", false))); + new ProjectFeatureFlag("mySuperSecretFeature", false)))); } } diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/AttributeSortTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/AttributeSortTest.java index f1af6eaa9..0809beec2 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/AttributeSortTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/AttributeSortTest.java @@ -10,6 +10,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.text.MatchesPattern.matchesPattern; +import com.fasterxml.jackson.databind.JsonMappingException; import org.apache.commons.lang3.SerializationUtils; import org.testng.annotations.Test; @@ -21,7 +22,7 @@ public class AttributeSortTest { @Test - public void testSerializePlain() throws Exception { + public void testSerializePlain() { final AttributeSort attributeSort = new AttributeSort("pk"); assertThat(attributeSort, net.javacrumbs.jsonunit.JsonMatchers.jsonEquals("pk")); } @@ -33,14 +34,19 @@ public void testDeserializePlain() throws Exception { assertThat(attributeSort.getValue(), is("pk")); } + @Test(expectedExceptions = JsonMappingException.class) + public void testDeserializeInvalid() throws Exception { + OBJECT_MAPPER.readValue("123", AttributeSort.class); + } + @Test - public void testSerializeLink() throws Exception { + public void testSerializeLink() { final AttributeSort attributeSort = new AttributeSort("/gdc/md/PROJECT_ID/obj/1806", true); assertThat(attributeSort, jsonEquals(resource("md/attributeSort.json"))); } @Test - public void testDeserializeLink() throws Exception { + public void testDeserializeLink() { final AttributeSort attributeSort = readObjectFromResource("/md/attributeSort.json", AttributeSort.class); assertThat(attributeSort, is(notNullValue())); assertThat(attributeSort.getValue(), is("/gdc/md/PROJECT_ID/obj/1806")); diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/NestedAttributeTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/NestedAttributeTest.java index db94548f3..099816aa3 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/NestedAttributeTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/NestedAttributeTest.java @@ -16,8 +16,8 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.text.MatchesPattern.matchesPattern; public class NestedAttributeTest { @@ -36,14 +36,14 @@ public void testDeserialization() throws Exception { assertThat(displayForm.getFormOf(), is("/gdc/md/PROJECT_ID/obj/DF_FORM_OF_ID")); assertThat(displayForm.getExpression(), is("[/gdc/md/PROJECT_ID/obj/DF_EXPRESSION_ID]")); - assertThat(displayForm.getLdmExpression(), isEmptyString()); + assertThat(displayForm.getLdmExpression(), is(emptyString())); final DisplayForm defaultDisplayForm = attribute.getDefaultDisplayForm(); assertThat(defaultDisplayForm, is(notNullValue())); assertThat(defaultDisplayForm.getFormOf(), is("/gdc/md/PROJECT_ID/obj/DF_FORM_OF_ID")); assertThat(defaultDisplayForm.getExpression(), is("[/gdc/md/PROJECT_ID/obj/DF_EXPRESSION_ID]")); - assertThat(defaultDisplayForm.getLdmExpression(), isEmptyString()); + assertThat(defaultDisplayForm.getLdmExpression(), is(emptyString())); final Collection primaryKeys = attribute.getPrimaryKeys(); assertThat(primaryKeys, is(Matchers.notNullValue())); diff --git a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/report/GridElementDeserializerTest.java b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/report/GridElementDeserializerTest.java index 5a1eeb6d6..fcfb5cf08 100644 --- a/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/report/GridElementDeserializerTest.java +++ b/gooddata-java-model/src/test/java/com/gooddata/sdk/model/md/report/GridElementDeserializerTest.java @@ -5,11 +5,13 @@ */ package com.gooddata.sdk.model.md.report; +import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.testng.annotations.Test; import java.util.ArrayList; +import static com.gooddata.util.ResourceUtils.OBJECT_MAPPER; import static com.gooddata.util.ResourceUtils.readObjectFromResource; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -29,6 +31,16 @@ public void testDeserializer() throws Exception { assertThat(elems.get(1), instanceOf(MetricGroup.class)); } + @Test(expectedExceptions = JsonMappingException.class) + public void testDeserializerWithInvalidMetricGroupString() throws Exception { + OBJECT_MAPPER.readValue("[\"meh\"]", GridElements.class); + } + + @Test(expectedExceptions = JsonMappingException.class) + public void testDeserializerWithUnknownType() throws Exception { + OBJECT_MAPPER.readValue("[123]", GridElements.class); + } + @JsonDeserialize(contentUsing = GridElementDeserializer.class) private static class GridElements extends ArrayList {} diff --git a/gooddata-java/src/main/java/com/gooddata/sdk/service/gdc/DataStoreService.java b/gooddata-java/src/main/java/com/gooddata/sdk/service/gdc/DataStoreService.java index 2362c157d..2b88113f8 100644 --- a/gooddata-java/src/main/java/com/gooddata/sdk/service/gdc/DataStoreService.java +++ b/gooddata-java/src/main/java/com/gooddata/sdk/service/gdc/DataStoreService.java @@ -8,15 +8,7 @@ import com.github.sardine.Sardine; import com.github.sardine.impl.SardineException; import com.gooddata.UriPrefixer; -import org.apache.http.Header; -import org.apache.http.HeaderIterator; -import org.apache.http.HttpEntity; -import org.apache.http.HttpHost; -import org.apache.http.HttpRequest; -import org.apache.http.HttpResponse; -import org.apache.http.NoHttpResponseException; -import org.apache.http.ProtocolVersion; -import org.apache.http.StatusLine; +import org.apache.http.*; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.HttpClient; import org.apache.http.client.NonRepeatableRequestException; @@ -409,11 +401,19 @@ public HeaderIterator headerIterator(String name) { return wrappedResponse.headerIterator(name); } + /** + * @deprecated because supertype's {@link HttpMessage#getParams()} is deprecated. + */ + @Deprecated @Override public HttpParams getParams() { return wrappedResponse.getParams(); } + /** + * @deprecated because supertype's {@link HttpMessage#setParams(HttpParams)} is deprecated. + */ + @Deprecated @Override public void setParams(HttpParams params) { wrappedResponse.setParams(params); diff --git a/gooddata-java/src/test/java/com/gooddata/sdk/service/dataload/processes/ProcessServiceAT.java b/gooddata-java/src/test/java/com/gooddata/sdk/service/dataload/processes/ProcessServiceAT.java index 308926567..7ba7f9fab 100644 --- a/gooddata-java/src/test/java/com/gooddata/sdk/service/dataload/processes/ProcessServiceAT.java +++ b/gooddata-java/src/test/java/com/gooddata/sdk/service/dataload/processes/ProcessServiceAT.java @@ -13,7 +13,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.hamcrest.Matchers; -import org.hamcrest.core.IsCollectionContaining; +import org.hamcrest.core.IsIterableContaining; import org.joda.time.Duration; import org.springframework.core.io.ClassPathResource; import org.testng.annotations.Test; @@ -126,7 +126,7 @@ public void copy(final String file, final File dir) throws IOException { @Test(groups = "process", dependsOnMethods = "createProcess") public void processes() { final Collection processes = gd.getProcessService().listProcesses(project); - assertThat(processes, IsCollectionContaining.hasItem(ProcessIdMatcher.hasSameProcessIdAs(process))); + assertThat(processes, IsIterableContaining.hasItem(ProcessIdMatcher.hasSameProcessIdAs(process))); } @Test(groups = "process", dependsOnMethods = "createProcess") @@ -151,7 +151,7 @@ public void removeProcess() throws Exception { gd.getProcessService().removeProcess(process); gd.getProcessService().removeProcess(processAppstore); final Collection processes = gd.getProcessService().listProcesses(project); - assertThat(processes, Matchers.not(IsCollectionContaining.hasItems(ProcessIdMatcher.hasSameProcessIdAs(process), ProcessIdMatcher.hasSameProcessIdAs(processAppstore)))); + assertThat(processes, Matchers.not(IsIterableContaining.hasItems(ProcessIdMatcher.hasSameProcessIdAs(process), ProcessIdMatcher.hasSameProcessIdAs(processAppstore)))); } @Test(dependsOnGroups = "process") @@ -159,7 +159,7 @@ public void removeSchedule() { gd.getProcessService().removeSchedule(schedule); gd.getProcessService().removeSchedule(triggeredSchedule); final MultiPageList schedules = (MultiPageList) gd.getProcessService().listSchedules(project); - assertThat(schedules.collectAll(), Matchers.not(IsCollectionContaining.hasItems(ScheduleIdMatcher.hasSameScheduleIdAs(schedule), ScheduleIdMatcher.hasSameScheduleIdAs(triggeredSchedule)))); + assertThat(schedules.collectAll(), Matchers.not(IsIterableContaining.hasItems(ScheduleIdMatcher.hasSameScheduleIdAs(schedule), ScheduleIdMatcher.hasSameScheduleIdAs(triggeredSchedule)))); } } diff --git a/gooddata-java/src/test/java/com/gooddata/sdk/service/executeafm/ExecuteAfmServiceAT.java b/gooddata-java/src/test/java/com/gooddata/sdk/service/executeafm/ExecuteAfmServiceAT.java index 4fc02aab1..f3343a74e 100644 --- a/gooddata-java/src/test/java/com/gooddata/sdk/service/executeafm/ExecuteAfmServiceAT.java +++ b/gooddata-java/src/test/java/com/gooddata/sdk/service/executeafm/ExecuteAfmServiceAT.java @@ -89,6 +89,7 @@ public void testGetVisualizationExecutionResult() { checkExecutionResult(visResult); } + @SuppressWarnings("deprecation") private VisualizationObject createVisualizationObject() { final String vizClassUri = gd.getMetadataService().getObjUri(project, VisualizationClass.class, identifier(GDC_TABLE_VISUALIZATION_CLASS_ID)); diff --git a/gooddata-java/src/test/java/com/gooddata/sdk/service/gdc/DataStoreServiceIT.java b/gooddata-java/src/test/java/com/gooddata/sdk/service/gdc/DataStoreServiceIT.java index 838ad8f17..12bee9f03 100644 --- a/gooddata-java/src/test/java/com/gooddata/sdk/service/gdc/DataStoreServiceIT.java +++ b/gooddata-java/src/test/java/com/gooddata/sdk/service/gdc/DataStoreServiceIT.java @@ -12,6 +12,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.nio.charset.Charset; import static com.gooddata.util.ResourceUtils.readFromResource; import static net.jadler.Jadler.onRequest; @@ -49,7 +50,7 @@ public void shouldUploadRelative() throws Exception { @Test public void shouldUploadWithFullStagingLink() throws Exception { - final String gdcBody = IOUtils.toString(readFromResource("/gdc/gdc.json")) + final String gdcBody = IOUtils.toString(readFromResource("/gdc/gdc.json"), Charset.defaultCharset()) .replaceAll("/uploads", "http://localhost:" + port() + "/uploads"); onRequest() .havingMethodEqualTo("GET") diff --git a/gooddata-java/src/test/java/com/gooddata/sdk/service/md/ExportImportServiceAT.java b/gooddata-java/src/test/java/com/gooddata/sdk/service/md/ExportImportServiceAT.java index 4e357a659..b48b83a0f 100644 --- a/gooddata-java/src/test/java/com/gooddata/sdk/service/md/ExportImportServiceAT.java +++ b/gooddata-java/src/test/java/com/gooddata/sdk/service/md/ExportImportServiceAT.java @@ -57,7 +57,7 @@ public void tearDown() throws Exception { public void partialExportMetric() throws Exception { partialMdExportToken = gd.getExportImportService().partialExport(project, new PartialMdExport(metric.getUri())).get(); assertThat(partialMdExportToken, notNullValue()); - assertThat(partialMdExportToken.getToken(), not(isEmptyOrNullString())); + assertThat(partialMdExportToken.getToken(), not(is(emptyOrNullString()))); assertThat(partialMdExportToken.isImportAttributeProperties(), is(false)); } diff --git a/gooddata-java/src/test/java/com/gooddata/sdk/service/md/MetadataServiceTest.java b/gooddata-java/src/test/java/com/gooddata/sdk/service/md/MetadataServiceTest.java index 9440f327e..2f7e9bedd 100644 --- a/gooddata-java/src/test/java/com/gooddata/sdk/service/md/MetadataServiceTest.java +++ b/gooddata-java/src/test/java/com/gooddata/sdk/service/md/MetadataServiceTest.java @@ -250,7 +250,7 @@ public void testFindIdentifierUrisNullProject() { @Test(expectedExceptions = IllegalArgumentException.class) public void testFindIdentifierUrisNullRestriction() { - service.findUris(project, null); + service.findUris(project, (Restriction) null); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/gooddata-java/src/test/java/com/gooddata/sdk/service/project/ProjectServiceAT.java b/gooddata-java/src/test/java/com/gooddata/sdk/service/project/ProjectServiceAT.java index 6d20a0da8..b0c89443f 100644 --- a/gooddata-java/src/test/java/com/gooddata/sdk/service/project/ProjectServiceAT.java +++ b/gooddata-java/src/test/java/com/gooddata/sdk/service/project/ProjectServiceAT.java @@ -5,29 +5,21 @@ */ package com.gooddata.sdk.service.project; -import com.gooddata.sdk.service.AbstractGoodDataAT; -import com.gooddata.sdk.model.account.Account; import com.gooddata.collections.PageRequest; +import com.gooddata.sdk.model.account.Account; import com.gooddata.sdk.model.project.*; +import com.gooddata.sdk.service.AbstractGoodDataAT; import org.apache.commons.lang3.RandomStringUtils; +import org.hamcrest.core.IsIterableContaining; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Set; -import java.util.UUID; +import java.util.*; import static com.gooddata.sdk.model.project.ProjectEnvironment.TESTING; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.core.IsCollectionContaining.hasItem; +import static org.hamcrest.Matchers.*; /** * Project acceptance tests. @@ -51,22 +43,22 @@ public void initIsolatedDomainGroup() { } @Test(groups = "project", dependsOnGroups = "account") - public void createProject() throws Exception { + public void createProject() { final Project p = new Project(title, projectToken); p.setEnvironment(TESTING); project = gd.getProjectService().createProject(p).get(); } @Test(groups = "project", dependsOnMethods = "createProject") - public void listProjects() throws Exception { + public void listProjects() { final ProjectService projectService = gd.getProjectService(); final Collection projects = projectService.getProjects(); - assertThat(projects, hasItem(ProjectIdMatcher.hasSameIdAs(project))); + assertThat(projects, IsIterableContaining.hasItem(ProjectIdMatcher.hasSameIdAs(project))); } @Test(groups = "project", dependsOnMethods = "createProject") - public void listProjectUsers() throws Exception { + public void listProjectUsers() { final ProjectService projectService = gd.getProjectService(); final List users = new ArrayList<>(); @@ -78,7 +70,7 @@ public void listProjectUsers() throws Exception { } @Test(groups = "project", dependsOnMethods = "createProject") - public void listProjectRoles() throws Exception { + public void listProjectRoles() { final ProjectService projectService = gd.getProjectService(); final Set roles = projectService.getRoles(project); @@ -86,26 +78,26 @@ public void listProjectRoles() throws Exception { } @Test(groups = "project", dependsOnMethods = "createProject") - public void getProjectById() throws Exception { + public void getProjectById() { final Project project = gd.getProjectService().getProjectById(this.project.getId()); assertThat(project, ProjectIdMatcher.hasSameIdAs(this.project)); } @Test(groups = "project", dependsOnMethods = "createProject") - public void getProjectByUri() throws Exception { + public void getProjectByUri() { final Project project = gd.getProjectService().getProjectByUri(this.project.getUri()); assertThat(project, ProjectIdMatcher.hasSameIdAs(this.project)); } @Test(groups = "project", dependsOnMethods = "createProject") - public void validateProject() throws Exception { + public void validateProject() { final ProjectValidationResults results = gd.getProjectService().validateProject(project).get(); assertThat(results, is(notNullValue())); assertThat(results.getResults(), is(notNullValue())); } @Test(groups = "project", dependsOnMethods = "createProject") - public void sendInvitations() throws Exception { + public void sendInvitations() { final Invitation invitation = new Invitation("qa+" + RandomStringUtils.randomAlphanumeric(10) + "@gooddata.com"); final CreatedInvitations invitations = gd.getProjectService().sendInvitations(project, invitation); assertThat(invitations, is(notNullValue())); @@ -113,7 +105,7 @@ public void sendInvitations() throws Exception { } @Test(groups = {"project", "isolated_domain"}, dependsOnMethods = "createProject") - public void addUserToProject() throws Exception { + public void addUserToProject() { final Set roles = gd.getProjectService().getRoles(project); final Role role = roles.iterator().next(); @@ -123,7 +115,7 @@ public void addUserToProject() throws Exception { } @Test(groups = {"project", "isolated_domain"}, dependsOnMethods = "addUserToProject") - public void disableUserInProject() throws Exception { + public void disableUserInProject() { user.setStatus(DISABLED_STATUS); gd.getProjectService().updateUserInProject(project, user); diff --git a/gooddata-java/src/test/java/com/gooddata/sdk/service/project/ProjectServiceTest.java b/gooddata-java/src/test/java/com/gooddata/sdk/service/project/ProjectServiceTest.java index 46301f62e..e49c62509 100644 --- a/gooddata-java/src/test/java/com/gooddata/sdk/service/project/ProjectServiceTest.java +++ b/gooddata-java/src/test/java/com/gooddata/sdk/service/project/ProjectServiceTest.java @@ -139,7 +139,7 @@ public void testUpdateUserInProjectNullProject() { @Test(expectedExceptions = IllegalArgumentException.class) public void testUpdateUserInProjectNullUser() { - service.updateUserInProject(mock(Project.class), null); + service.updateUserInProject(mock(Project.class), (User) null); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/gooddata-java/src/test/java/com/gooddata/sdk/service/warehouse/WarehouseServiceAT.java b/gooddata-java/src/test/java/com/gooddata/sdk/service/warehouse/WarehouseServiceAT.java index 4249f5528..105f3ca7b 100644 --- a/gooddata-java/src/test/java/com/gooddata/sdk/service/warehouse/WarehouseServiceAT.java +++ b/gooddata-java/src/test/java/com/gooddata/sdk/service/warehouse/WarehouseServiceAT.java @@ -5,17 +5,18 @@ */ package com.gooddata.sdk.service.warehouse; -import com.gooddata.sdk.service.AbstractGoodDataAT; -import com.gooddata.sdk.model.account.Account; import com.gooddata.collections.Page; import com.gooddata.collections.PageRequest; import com.gooddata.collections.PageableList; +import com.gooddata.sdk.model.account.Account; import com.gooddata.sdk.model.project.Environment; import com.gooddata.sdk.model.warehouse.Warehouse; import com.gooddata.sdk.model.warehouse.WarehouseSchema; import com.gooddata.sdk.model.warehouse.WarehouseUser; import com.gooddata.sdk.model.warehouse.WarehouseUserRole; +import com.gooddata.sdk.service.AbstractGoodDataAT; import org.hamcrest.Matchers; +import org.hamcrest.core.IsIterableContaining; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -26,14 +27,7 @@ import static com.gooddata.sdk.service.warehouse.WarehouseIdMatcher.hasSameIdAs; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasProperty; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.core.IsCollectionContaining.hasItem; +import static org.hamcrest.Matchers.*; /** * Warehouse acceptance tests @@ -64,20 +58,20 @@ public void initIsolatedDomainGroup() { } @Test(groups = "warehouse", dependsOnGroups = "account") - public void createWarehouse() throws Exception { + public void createWarehouse() { final Warehouse wh = new Warehouse(title, warehouseToken); wh.setEnvironment(Environment.TESTING); warehouse = service.createWarehouse(wh).get(60, TimeUnit.MINUTES); } @Test(groups = "warehouse", dependsOnMethods = "createWarehouse") - public void getWarehouse() throws Exception { + public void getWarehouse() { final Warehouse warehouse = service.getWarehouseById(this.warehouse.getId()); assertThat(warehouse, Matchers.is(hasSameIdAs(warehouse))); } @Test(groups = "warehouse", dependsOnMethods = "createWarehouse") - public void listWarehouses() throws Exception { + public void listWarehouses() { final LinkedList result = new LinkedList<>(); Page page = new PageRequest(1000); PageableList warehouses; @@ -88,11 +82,11 @@ public void listWarehouses() throws Exception { page = warehouses.getNextPage(); } while (warehouses.hasNextPage()); - assertThat(result, hasItem(hasSameIdAs(warehouse))); + assertThat(result, IsIterableContaining.hasItem(hasSameIdAs(warehouse))); } @Test(groups = "warehouse", dependsOnMethods = {"createWarehouse", "listWarehouses"}) - public void shouldPageList() throws Exception { + public void shouldPageList() { final String title = this.title + " second"; final Warehouse wh = new Warehouse(title, warehouseToken); wh.setEnvironment(Environment.TESTING); @@ -106,7 +100,7 @@ public void shouldPageList() throws Exception { } @Test(groups = "warehouse", dependsOnMethods = "shouldPageList") - public void shouldReturnNullOnEndOfPaging() throws Exception { + public void shouldReturnNullOnEndOfPaging() { PageableList page = service.listWarehouses(); Page nextPage; while ((nextPage = page.getNextPage()) != null) { @@ -115,7 +109,7 @@ public void shouldReturnNullOnEndOfPaging() throws Exception { } @Test(groups = "warehouse", dependsOnMethods = "createWarehouse") - public void shouldListUsers() throws Exception { + public void shouldListUsers() { final PageableList users = service.listWarehouseUsers(warehouse, new PageRequest(1)); assertThat(users, hasSize(1)); assertThat(users.get(0), is(notNullValue())); @@ -154,7 +148,7 @@ public void getDefaultWarehouseSchema() { } @Test(dependsOnGroups = "warehouse") - public void removeWarehouse() throws Exception { + public void removeWarehouse() { service.removeWarehouse(warehouse); warehouse = null; service.removeWarehouse(warehouse2); @@ -162,7 +156,7 @@ public void removeWarehouse() throws Exception { } @AfterClass - public void tearDown() throws Exception { + public void tearDown() { try { if (warehouse != null) { service.removeWarehouse(warehouse);