From d40c6be6c5d1dd5c6979466319eea49e7ed691fc Mon Sep 17 00:00:00 2001 From: timtay-microsoft Date: Thu, 29 Oct 2020 17:51:40 -0700 Subject: [PATCH 1/2] Add etag property to BasicRelationship Also renamed property and setter/getter in BasicDigitalTwin to match it --- .../digitaltwins/core/BasicDigitalTwin.java | 10 +++++----- .../digitaltwins/core/BasicRelationship.java | 20 +++++++++++++++++++ .../core/RelationshipsSyncSamples.java | 4 +++- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwin.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwin.java index 33d67cb6210f..e36e2e537682 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwin.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwin.java @@ -29,7 +29,7 @@ public final class BasicDigitalTwin { private String id; @JsonProperty(value = DigitalTwinsJsonPropertyNames.DIGITAL_TWIN_ETAG, required = true) - private String twinETag; + private String etag; @JsonProperty(value = DigitalTwinsJsonPropertyNames.DIGITAL_TWIN_METADATA, required = true) private BasicDigitalTwinMetadata metadata; @@ -62,16 +62,16 @@ public String getId() { * @return A string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. */ public String getETag() { - return twinETag; + return etag; } /** * Sets a string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. - * @param twinETag A string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. + * @param etag A string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. * @return The BasicDigitalTwin object itself. */ - public BasicDigitalTwin setETag(String twinETag) { - this.twinETag = twinETag; + public BasicDigitalTwin setETag(String etag) { + this.etag = etag; return this; } diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java index 2c7637a2eca6..e2af4e7ef42e 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java @@ -37,6 +37,9 @@ public final class BasicRelationship { @JsonProperty(value = DigitalTwinsJsonPropertyNames.RELATIONSHIP_NAME, required = true) private String name; + @JsonProperty(value = DigitalTwinsJsonPropertyNames.DIGITAL_TWIN_ETAG) + private String etag; + @JsonIgnore private final Map properties = new HashMap<>(); @@ -94,6 +97,23 @@ public String getName() { return name; } + /** + * Gets a string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. + * @return A string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. + */ + public String getETag() { + return etag; + } + + /** + * Sets a string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. + * @param etag A string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. + * @return The BasicDigitalTwin object itself. + */ + public void setETag(String etag) { + this.etag = etag; + } + /** * Gets the additional custom properties defined in the model. This field will contain any properties of the relationship that are not already defined by the other strong types of this class. * @return The additional custom properties defined in the model. This field will contain any properties of the relationship that are not already defined by the other strong types of this class. diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/RelationshipsSyncSamples.java b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/RelationshipsSyncSamples.java index c5ada665870f..699e3ba17e00 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/RelationshipsSyncSamples.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/RelationshipsSyncSamples.java @@ -120,7 +120,9 @@ public static void runRelationshipsSample() throws JsonProcessingException { BasicRelationship retrievedRelationship = getRelationshipResponse.getValue(); ConsoleLogger.printSuccess("Retrieved relationship: " + retrievedRelationship.getId() + " from twin: " + retrievedRelationship.getSourceId() + "\n\t" + "Prop1: " + retrievedRelationship.getProperties().get("Prop1") + "\n\t" + - "Prop2: " + retrievedRelationship.getProperties().get("Prop2")); + "Prop2: " + retrievedRelationship.getProperties().get("Prop2") + "\n"); + + ConsoleLogger.printSuccess("Retrieved relationship has ETag: " + retrievedRelationship.getETag() + "\n\t"); } ConsoleLogger.printHeader("List relationships"); From c8381449879776e055ba7d81502bc221f308e21c Mon Sep 17 00:00:00 2001 From: timtay-microsoft Date: Thu, 29 Oct 2020 18:01:37 -0700 Subject: [PATCH 2/2] fixup --- .../java/com/azure/digitaltwins/core/BasicRelationship.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java index e2af4e7ef42e..bf305d5af835 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java @@ -108,10 +108,11 @@ public String getETag() { /** * Sets a string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. * @param etag A string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. - * @return The BasicDigitalTwin object itself. + * @return The BasicRelationship object itself. */ - public void setETag(String etag) { + public BasicRelationship setETag(String etag) { this.etag = etag; + return this; } /**