Skip to content

Commit

Permalink
ADT: Update checkstyle-suppressions.xml to remove digital twins * sup…
Browse files Browse the repository at this point in the history
…pression rule. (#22824)
  • Loading branch information
azabbasi authored Jul 9, 2021
1 parent 9b906ce commit 3ae6af8
Show file tree
Hide file tree
Showing 110 changed files with 1,506 additions and 1,353 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,9 @@ the main ServiceBusClientBuilder. -->

<!-- TODO: (https://github.com/Azure/azure-sdk-for-java/issues/18279) -->
<!-- Suppress DigitalTwins for now -->
<suppress checks="[a-zA-Z0-9]*" files="[/\\]azure-digitaltwins-core[/\\]src[/\\]"/>
<suppress checks="[a-zA-Z0-9]*" files="[/\\]azure-digitaltwins-core[/\\]src[/\\]main[/\\]java[/\\]com[/\\]azure[/\\]digitaltwins[/\\]core[/\\]implementation[/\\]"/>
<suppress checks="com.azure.tools.checkstyle.checks.ServiceClient" files="[/\\]azure-digitaltwins-core[/\\]src[/\\]main[/\\]java[/\\]com[/\\]azure[/\\]digitaltwins[/\\]core[/\\]DigitalTwinsClient.java"/>
<suppress checks="com.azure.tools.checkstyle.checks.ServiceClient" files="[/\\]azure-digitaltwins-core[/\\]src[/\\]main[/\\]java[/\\]com[/\\]azure[/\\]digitaltwins[/\\]core[/\\]DigitalTwinsAsyncClient.java"/>
<suppress checks="[a-zA-Z0-9]*" files="[/\\]azure-ai-anomalydetector[/\\]src[/\\]"/>
<suppress checks="[a-zA-Z0-9]*" files="[/\\]azure-iot-deviceupdate[/\\]src[/\\]"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@

import com.azure.core.annotation.Fluent;
import com.azure.digitaltwins.core.models.DigitalTwinsJsonPropertyNames;
import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;

import java.util.HashMap;
import java.util.Map;

import static com.fasterxml.jackson.annotation.JsonInclude.*;
import static com.fasterxml.jackson.annotation.JsonInclude.Include;

/**
* An optional, helper class for deserializing a digital twin.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
package com.azure.digitaltwins.core;

import com.azure.core.annotation.Fluent;
import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@

import com.azure.core.annotation.Fluent;
import com.azure.digitaltwins.core.models.DigitalTwinsJsonPropertyNames;
import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;

import java.util.HashMap;
import java.util.Map;

import static com.fasterxml.jackson.annotation.JsonInclude.*;

/**
* An optional, helper class for deserializing a digital twin.
* The $metadata class on a {@link BasicDigitalTwin}.
* Only properties with non-null values are included.
*/
@Fluent
@JsonInclude(Include.NON_NULL)
@JsonInclude(JsonInclude.Include.NON_NULL)
public final class BasicDigitalTwinMetadata {

@JsonProperty(value = DigitalTwinsJsonPropertyNames.METADATA_MODEL, required = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@

import com.azure.core.annotation.Fluent;
import com.azure.digitaltwins.core.models.DigitalTwinsJsonPropertyNames;
import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;

import java.util.HashMap;
import java.util.Map;

import static com.fasterxml.jackson.annotation.JsonInclude.*;
import static com.fasterxml.jackson.annotation.JsonInclude.Include;

/**
* Although relationships have a user-defined schema, these properties should exist on every instance.
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.regex.Pattern;

/**
* This class provides a fluent builder API to help aid the configuration and instantiation of {@link DigitalTwinsClient
Expand Down Expand Up @@ -68,9 +67,9 @@ public final class DigitalTwinsClientBuilder {
// of the header's value. These null values are equivalent to just constructing "new RetryPolicy()". It is safe
// to use a null retryAfterHeader and a null retryAfterTimeUnit when constructing this retry policy as this
// constructor interprets that as saying "this service does not support retry after headers"
private static final String retryAfterHeader = null;
private static final ChronoUnit retryAfterTimeUnit = null;
private static final RetryPolicy DEFAULT_RETRY_POLICY = new RetryPolicy(retryAfterHeader, retryAfterTimeUnit);
private static final String RETRY_AFTER_HEADER = null;
private static final ChronoUnit RETRY_AFTER_TIME_UNIT = null;
private static final RetryPolicy DEFAULT_RETRY_POLICY = new RetryPolicy(RETRY_AFTER_HEADER, RETRY_AFTER_TIME_UNIT);

private final Map<String, String> properties;

Expand All @@ -79,22 +78,22 @@ public final class DigitalTwinsClientBuilder {
/**
* The public constructor for DigitalTwinsClientBuilder
*/
public DigitalTwinsClientBuilder()
{
public DigitalTwinsClientBuilder() {
additionalPolicies = new ArrayList<>();
properties = CoreUtils.getProperties(DIGITAL_TWINS_PROPERTIES);
httpLogOptions = new HttpLogOptions();
}

private static HttpPipeline buildPipeline(TokenCredential tokenCredential,
String endpoint,
HttpLogOptions httpLogOptions,
ClientOptions clientOptions,
HttpClient httpClient,
List<HttpPipelinePolicy> additionalPolicies,
RetryPolicy retryPolicy,
Configuration configuration,
Map<String, String> properties) {
private static HttpPipeline setupPipeline(
TokenCredential tokenCredential,
String endpoint,
HttpLogOptions httpLogOptions,
ClientOptions clientOptions,
HttpClient httpClient,
List<HttpPipelinePolicy> additionalPolicies,
RetryPolicy retryPolicy,
Configuration configuration,
Map<String, String> properties) {
// Closest to API goes first, closest to wire goes last.
List<HttpPipelinePolicy> policies = new ArrayList<>();

Expand Down Expand Up @@ -170,27 +169,24 @@ public DigitalTwinsAsyncClient buildAsyncClient() {
Objects.requireNonNull(endpoint, "'endpoint' cannot be null");

Configuration buildConfiguration = this.configuration;
if (buildConfiguration == null)
{
if (buildConfiguration == null) {
buildConfiguration = Configuration.getGlobalConfiguration().clone();
}

// Set defaults for these fields if they were not set while building the client
DigitalTwinsServiceVersion serviceVersion = this.serviceVersion;
if (serviceVersion == null)
{
if (serviceVersion == null) {
serviceVersion = DigitalTwinsServiceVersion.getLatest();
}

// Default is exponential backoff
RetryPolicy retryPolicy = this.retryPolicy;
if (retryPolicy == null)
{
if (retryPolicy == null) {
retryPolicy = DEFAULT_RETRY_POLICY;
}

if (this.httpPipeline == null) {
this.httpPipeline = buildPipeline(
this.httpPipeline = setupPipeline(
this.tokenCredential,
this.endpoint,
this.httpLogOptions,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.azure.core.util.Configuration;
import com.azure.core.util.serializer.JacksonAdapter;
import com.azure.core.util.serializer.SerializerAdapter;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@
import com.azure.digitaltwins.core.implementation.models.DigitalTwinsModelData;
import com.azure.digitaltwins.core.implementation.models.ErrorResponseException;
import com.azure.digitaltwins.core.implementation.models.PagedDigitalTwinsModelDataCollection;
import java.util.List;
import reactor.core.publisher.Mono;

import java.util.List;

/** An instance of this class provides access to all the operations defined in DigitalTwinModels. */
public final class DigitalTwinModelsImpl {
/** The proxy service used to perform REST calls. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static DigitalTwinsModelData map(com.azure.digitaltwins.core.implementati

String modelStringValue = null;

if (input.getModel() != null){
if (input.getModel() != null) {
try {
modelStringValue = new ObjectMapper().writeValueAsString(input.getModel());
} catch (JsonProcessingException e) {
Expand All @@ -41,5 +41,5 @@ public static DigitalTwinsModelData map(com.azure.digitaltwins.core.implementati
input.isDecommissioned());
}

private DigitalTwinsModelDataConverter() {}
private DigitalTwinsModelDataConverter() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ public static com.azure.digitaltwins.core.implementation.models.EventRoute map(D
return mappedEventRoute;
}

private EventRouteConverter() {}
private EventRouteConverter() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static IncomingRelationship map(com.azure.digitaltwins.core.implementatio
if (input == null) {
return null;
}

return new IncomingRelationship(
input.getRelationshipId(),
input.getSourceId(),
Expand All @@ -44,5 +44,5 @@ public static com.azure.digitaltwins.core.implementation.models.IncomingRelation
return mappedIncomingRelationship;
}

private IncomingRelationshipConverter() {}
private IncomingRelationshipConverter() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,26 @@

package com.azure.digitaltwins.core.implementation.converters;

import com.azure.digitaltwins.core.implementation.models.*;
import com.azure.digitaltwins.core.models.*;
import com.azure.digitaltwins.core.implementation.models.DigitalTwinModelsListOptions;
import com.azure.digitaltwins.core.implementation.models.DigitalTwinsAddOptions;
import com.azure.digitaltwins.core.implementation.models.DigitalTwinsAddRelationshipOptions;
import com.azure.digitaltwins.core.implementation.models.DigitalTwinsDeleteOptions;
import com.azure.digitaltwins.core.implementation.models.DigitalTwinsDeleteRelationshipOptions;
import com.azure.digitaltwins.core.implementation.models.DigitalTwinsUpdateComponentOptions;
import com.azure.digitaltwins.core.implementation.models.DigitalTwinsUpdateOptions;
import com.azure.digitaltwins.core.implementation.models.DigitalTwinsUpdateRelationshipOptions;
import com.azure.digitaltwins.core.implementation.models.EventRoutesListOptions;
import com.azure.digitaltwins.core.implementation.models.QueryTwinsOptions;
import com.azure.digitaltwins.core.models.CreateOrReplaceDigitalTwinOptions;
import com.azure.digitaltwins.core.models.CreateOrReplaceRelationshipOptions;
import com.azure.digitaltwins.core.models.DeleteDigitalTwinOptions;
import com.azure.digitaltwins.core.models.DeleteRelationshipOptions;
import com.azure.digitaltwins.core.models.ListDigitalTwinsEventRoutesOptions;
import com.azure.digitaltwins.core.models.ListModelsOptions;
import com.azure.digitaltwins.core.models.QueryOptions;
import com.azure.digitaltwins.core.models.UpdateComponentOptions;
import com.azure.digitaltwins.core.models.UpdateDigitalTwinOptions;
import com.azure.digitaltwins.core.models.UpdateRelationshipOptions;

/**
* Helper class used internally to convert convenience layer options objects into protocol layer options objects.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ public DigitalTwinModelsAddOptions setTracestate(String tracestate) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ public DigitalTwinModelsDeleteOptions setTracestate(String tracestate) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ public DigitalTwinModelsGetByIdOptions setTracestate(String tracestate) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,5 @@ public DigitalTwinModelsListOptions setMaxItemsPerPage(Integer maxItemsPerPage)
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ public DigitalTwinModelsUpdateOptions setTracestate(String tracestate) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ public DigitalTwinsAddHeaders setETag(String eTag) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,5 @@ public DigitalTwinsAddOptions setIfNoneMatch(String ifNoneMatch) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ public DigitalTwinsAddRelationshipHeaders setETag(String eTag) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,5 @@ public DigitalTwinsAddRelationshipOptions setIfNoneMatch(String ifNoneMatch) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,5 @@ public DigitalTwinsDeleteOptions setIfMatch(String ifMatch) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,5 @@ public DigitalTwinsDeleteRelationshipOptions setIfMatch(String ifMatch) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ public DigitalTwinsGetByIdHeaders setETag(String eTag) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ public DigitalTwinsGetByIdOptions setTracestate(String tracestate) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ public DigitalTwinsGetComponentHeaders setETag(String eTag) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ public DigitalTwinsGetComponentOptions setTracestate(String tracestate) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ public DigitalTwinsGetRelationshipByIdHeaders setETag(String eTag) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ public DigitalTwinsGetRelationshipByIdOptions setTracestate(String tracestate) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ public DigitalTwinsListIncomingRelationshipsOptions setTracestate(String tracest
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ public DigitalTwinsListRelationshipsOptions setTracestate(String tracestate) {
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {}
public void validate() { }
}
Loading

0 comments on commit 3ae6af8

Please sign in to comment.