Move digital twin "basic" classes to base namespace to match .NET (#1…

…6927)
Azure · Oct 28, 2020 · f67af2d · f67af2d
1 parent 3ad24a3
commit f67af2d
Show file tree

Hide file tree

Showing 18 changed files with 16 additions and 22 deletions.
diff --git a/...altwins/core/models/BasicDigitalTwin.java → ...e/digitaltwins/core/BasicDigitalTwin.java b/...altwins/core/models/BasicDigitalTwin.java → ...e/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/...ore/models/BasicDigitalTwinComponent.java → ...twins/core/BasicDigitalTwinComponent.java b/...ore/models/BasicDigitalTwinComponent.java → ...twins/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/...core/models/BasicDigitalTwinMetadata.java → ...ltwins/core/BasicDigitalTwinMetadata.java b/...core/models/BasicDigitalTwinMetadata.java → ...ltwins/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/...ltwins/core/models/BasicRelationship.java → .../digitaltwins/core/BasicRelationship.java b/...ltwins/core/models/BasicRelationship.java → .../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/...e/models/DigitalTwinPropertyMetadata.java → ...ins/core/DigitalTwinPropertyMetadata.java b/...e/models/DigitalTwinPropertyMetadata.java → ...ins/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
@@ -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/...-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/ComponentSyncSamples.java b/...-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/...s-core/src/samples/java/com/azure/digitaltwins/core/DigitalTwinsLifecycleAsyncSample.java b/...s-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/...java/com/azure/digitaltwins/core/snippets/DigitalTwinsAsyncClientJavaDocCodeSnippets.java b/...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/...ples/java/com/azure/digitaltwins/core/snippets/DigitalTwinsClientJavaDocCodeSnippets.java b/...ples/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/...ure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ComponentsAsyncTests.java b/...ure-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/...ns/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ComponentsTests.java b/...ns/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/...ins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipAsyncTest.java b/...ins-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/...wins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipTestBase.java b/...wins-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/...ure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsTestBase.java b/...ure-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/...ns/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/QueryAsyncTests.java b/...ns/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/...altwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/QueryTests.java b/...altwins/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/...ins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/TwinAsyncTests.java b/...ins/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;