diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/BasicDigitalTwin.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwin.java similarity index 97% rename from sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/BasicDigitalTwin.java rename to sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwin.java index 7e2167201f2b..33d67cb6210f 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/BasicDigitalTwin.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwin.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.digitaltwins.core.models; +package com.azure.digitaltwins.core; import com.azure.core.annotation.Fluent; +import com.azure.digitaltwins.core.models.DigitalTwinsJsonPropertyNames; import com.fasterxml.jackson.annotation.*; import java.util.HashMap; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/BasicDigitalTwinComponent.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwinComponent.java similarity index 98% rename from sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/BasicDigitalTwinComponent.java rename to sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwinComponent.java index d94737700589..72e72c7ff6b3 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/BasicDigitalTwinComponent.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwinComponent.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.digitaltwins.core.models; +package com.azure.digitaltwins.core; import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.*; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/BasicDigitalTwinMetadata.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwinMetadata.java similarity index 95% rename from sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/BasicDigitalTwinMetadata.java rename to sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwinMetadata.java index 5d2bcda347c1..4eeb513d2a6a 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/BasicDigitalTwinMetadata.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwinMetadata.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.digitaltwins.core.models; +package com.azure.digitaltwins.core; import com.azure.core.annotation.Fluent; +import com.azure.digitaltwins.core.models.DigitalTwinsJsonPropertyNames; import com.fasterxml.jackson.annotation.*; import java.util.HashMap; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/BasicRelationship.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java similarity index 97% rename from sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/BasicRelationship.java rename to sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java index 0929331cbe7c..2c7637a2eca6 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/BasicRelationship.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.digitaltwins.core.models; +package com.azure.digitaltwins.core; import com.azure.core.annotation.Fluent; +import com.azure.digitaltwins.core.models.DigitalTwinsJsonPropertyNames; import com.fasterxml.jackson.annotation.*; import java.util.HashMap; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/DigitalTwinPropertyMetadata.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinPropertyMetadata.java similarity index 90% rename from sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/DigitalTwinPropertyMetadata.java rename to sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinPropertyMetadata.java index 34d06157727e..fca1389b51f6 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/models/DigitalTwinPropertyMetadata.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinPropertyMetadata.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.digitaltwins.core.models; +package com.azure.digitaltwins.core; +import com.azure.digitaltwins.core.models.DigitalTwinsJsonPropertyNames; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.OffsetDateTime; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/module-info.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/module-info.java index dddd54c0b904..08a88f046b79 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/module-info.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/module-info.java @@ -7,6 +7,7 @@ exports com.azure.digitaltwins.core; exports com.azure.digitaltwins.core.models; + opens com.azure.digitaltwins.core to com.fasterxml.jackson.databind; opens com.azure.digitaltwins.core.models to com.fasterxml.jackson.databind, com.azure.core; opens com.azure.digitaltwins.core.implementation to com.fasterxml.jackson.databind, com.azure.core; opens com.azure.digitaltwins.core.implementation.models to com.fasterxml.jackson.databind, com.azure.core; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/ComponentSyncSamples.java b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/ComponentSyncSamples.java index ad17d9c118ca..b60698067d07 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/ComponentSyncSamples.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/ComponentSyncSamples.java @@ -8,10 +8,7 @@ import com.azure.digitaltwins.core.helpers.SamplesConstants; import com.azure.digitaltwins.core.helpers.UniqueIdHelper; import com.azure.digitaltwins.core.implementation.models.ErrorResponseException; -import com.azure.digitaltwins.core.models.BasicDigitalTwinComponent; -import com.azure.digitaltwins.core.models.BasicDigitalTwinMetadata; import com.azure.digitaltwins.core.models.DigitalTwinsModelData; -import com.azure.digitaltwins.core.models.BasicDigitalTwin; import com.azure.digitaltwins.core.models.UpdateOperationUtility; import com.azure.identity.ClientSecretCredentialBuilder; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/DigitalTwinsLifecycleAsyncSample.java b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/DigitalTwinsLifecycleAsyncSample.java index 29e818e7ccf7..07a9700aa41d 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/DigitalTwinsLifecycleAsyncSample.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/DigitalTwinsLifecycleAsyncSample.java @@ -8,8 +8,6 @@ import com.azure.digitaltwins.core.helpers.FileHelper; import com.azure.digitaltwins.core.helpers.SamplesArguments; import com.azure.digitaltwins.core.implementation.models.ErrorResponseException; -import com.azure.digitaltwins.core.models.BasicDigitalTwin; -import com.azure.digitaltwins.core.models.BasicRelationship; import com.azure.identity.ClientSecretCredentialBuilder; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/snippets/DigitalTwinsAsyncClientJavaDocCodeSnippets.java b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/snippets/DigitalTwinsAsyncClientJavaDocCodeSnippets.java index 12ea65c595ad..c425acf0c595 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/snippets/DigitalTwinsAsyncClientJavaDocCodeSnippets.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/snippets/DigitalTwinsAsyncClientJavaDocCodeSnippets.java @@ -1,5 +1,8 @@ package com.azure.digitaltwins.core.snippets; +import com.azure.digitaltwins.core.BasicDigitalTwin; +import com.azure.digitaltwins.core.BasicDigitalTwinMetadata; +import com.azure.digitaltwins.core.BasicRelationship; import com.azure.digitaltwins.core.DigitalTwinsAsyncClient; import com.azure.digitaltwins.core.DigitalTwinsClientBuilder; import com.azure.digitaltwins.core.models.*; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/snippets/DigitalTwinsClientJavaDocCodeSnippets.java b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/snippets/DigitalTwinsClientJavaDocCodeSnippets.java index 81b5a1493601..a3f57d169736 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/snippets/DigitalTwinsClientJavaDocCodeSnippets.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/snippets/DigitalTwinsClientJavaDocCodeSnippets.java @@ -3,6 +3,9 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; +import com.azure.digitaltwins.core.BasicDigitalTwin; +import com.azure.digitaltwins.core.BasicDigitalTwinMetadata; +import com.azure.digitaltwins.core.BasicRelationship; import com.azure.digitaltwins.core.DigitalTwinsAsyncClient; import com.azure.digitaltwins.core.DigitalTwinsClient; import com.azure.digitaltwins.core.DigitalTwinsClientBuilder; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ComponentsAsyncTests.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ComponentsAsyncTests.java index 077d3a6f98b5..40f0e51c8894 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ComponentsAsyncTests.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ComponentsAsyncTests.java @@ -3,7 +3,6 @@ import com.azure.core.http.HttpClient; import com.azure.core.util.logging.ClientLogger; import com.azure.digitaltwins.core.helpers.UniqueIdHelper; -import com.azure.digitaltwins.core.models.BasicDigitalTwin; import com.fasterxml.jackson.core.JsonProcessingException; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ComponentsTests.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ComponentsTests.java index 7568c4644247..8fcf0c2b1b98 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ComponentsTests.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ComponentsTests.java @@ -6,7 +6,6 @@ import com.azure.core.http.HttpClient; import com.azure.digitaltwins.core.helpers.UniqueIdHelper; import com.azure.digitaltwins.core.models.DigitalTwinsModelData; -import com.azure.digitaltwins.core.models.BasicDigitalTwin; import com.azure.digitaltwins.core.models.DigitalTwinsResponse; import com.fasterxml.jackson.core.JsonProcessingException; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipAsyncTest.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipAsyncTest.java index 94c0e404488a..3d1c7b1cf230 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipAsyncTest.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipAsyncTest.java @@ -5,8 +5,6 @@ import com.azure.core.http.HttpClient; import com.azure.core.util.logging.ClientLogger; -import com.azure.digitaltwins.core.models.BasicDigitalTwin; -import com.azure.digitaltwins.core.models.BasicRelationship; import com.azure.digitaltwins.core.models.CreateOrReplaceRelationshipOptions; import com.azure.digitaltwins.core.models.IncomingRelationship; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipTestBase.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipTestBase.java index be92bb63fe14..b1a44ff9dbf3 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipTestBase.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipTestBase.java @@ -4,7 +4,6 @@ package com.azure.digitaltwins.core; import com.azure.core.http.HttpClient; -import com.azure.digitaltwins.core.models.BasicDigitalTwin; import com.fasterxml.jackson.core.JsonProcessingException; import org.junit.jupiter.api.Test; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsTestBase.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsTestBase.java index c1113b488df3..2a91f03d7d77 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsTestBase.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsTestBase.java @@ -9,13 +9,9 @@ import com.azure.core.http.policy.HttpPipelinePolicy; import com.azure.core.test.TestBase; import com.azure.core.util.Configuration; -import com.azure.core.util.serializer.JacksonAdapter; -import com.azure.digitaltwins.core.implementation.serializer.DigitalTwinsStringSerializer; -import com.azure.digitaltwins.core.models.BasicDigitalTwin; import com.azure.identity.ClientSecretCredentialBuilder; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; import reactor.core.publisher.Mono; import java.time.OffsetDateTime; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/QueryAsyncTests.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/QueryAsyncTests.java index 09993de445ce..7d27d317d133 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/QueryAsyncTests.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/QueryAsyncTests.java @@ -3,7 +3,6 @@ import com.azure.core.http.HttpClient; import com.azure.core.util.logging.ClientLogger; import com.azure.digitaltwins.core.helpers.UniqueIdHelper; -import com.azure.digitaltwins.core.models.BasicDigitalTwin; import com.azure.digitaltwins.core.models.QueryOptions; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/QueryTests.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/QueryTests.java index 8b2079df87e6..bee87997f627 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/QueryTests.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/QueryTests.java @@ -6,7 +6,6 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.digitaltwins.core.helpers.UniqueIdHelper; -import com.azure.digitaltwins.core.models.BasicDigitalTwin; import com.azure.digitaltwins.core.models.QueryOptions; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/TwinAsyncTests.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/TwinAsyncTests.java index d474f8fc78e8..dc2a658b6042 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/TwinAsyncTests.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/TwinAsyncTests.java @@ -3,7 +3,6 @@ import com.azure.core.http.HttpClient; import com.azure.core.util.logging.ClientLogger; import com.azure.digitaltwins.core.helpers.UniqueIdHelper; -import com.azure.digitaltwins.core.models.*; import com.fasterxml.jackson.core.JsonProcessingException; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource;