Remove deprecated

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();

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();
 

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";

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);

gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionTask.java

@@ -33,20 +33,10 @@ private ProcessExecutionTask(@JsonProperty("links") Map<String, String> 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);
     }

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<ObjQualifier> 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

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),

gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureDefinition.java

@@ -10,14 +10,14 @@
 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;
 
 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),
@@ -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.
      * <p>
@@ -65,21 +52,6 @@ default String getUri() {
     @JsonIgnore
     Collection<ObjQualifier> 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.

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));

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,48 +51,13 @@ 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<ObjQualifier> getObjQualifiers() {
         return this.dateAttributes.stream()
                 .map(OverPeriodDateAttribute::getAttribute)
                 .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");