Change Lists to Iterable (#15371)

Azure · Sep 18, 2020 · ff22f54 · ff22f54
1 parent 89b1d3e
commit ff22f54
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 26 deletions.
diff --git a/...-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsAsyncClient.java b/...-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsAsyncClient.java
@@ -542,7 +542,7 @@ PagedFlux<IncomingRelationship> listIncomingRelationships(String digitalTwinId,
      * will contain metadata about the created model, but will not contain the model itself.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public Mono<List<DigitalTwinsModelData>> createModels(List<String> models) {
+    public Mono<Iterable<DigitalTwinsModelData>> createModels(Iterable<String> models) {
         return createModelsWithResponse(models)
             .map(Response::getValue);
     }
@@ -554,11 +554,11 @@ public Mono<List<DigitalTwinsModelData>> createModels(List<String> models) {
      * will contain metadata about the created model, but will not contain the model itself.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public Mono<Response<List<DigitalTwinsModelData>>> createModelsWithResponse(List<String> models) {
+    public Mono<Response<Iterable<DigitalTwinsModelData>>> createModelsWithResponse(Iterable<String> models) {
         return withContext(context -> createModelsWithResponse(models, context));
     }
 
-    Mono<Response<List<DigitalTwinsModelData>>> createModelsWithResponse(List<String> models, Context context) {
+    Mono<Response<Iterable<DigitalTwinsModelData>>> createModelsWithResponse(Iterable<String> models, Context context) {
         List<Object> modelsPayload = new ArrayList<>();
         for (String model: models) {
             try {
@@ -572,7 +572,7 @@ Mono<Response<List<DigitalTwinsModelData>>> createModelsWithResponse(List<String
 
         return protocolLayer.getDigitalTwinModels().addWithResponseAsync(modelsPayload, context)
             .map(listResponse -> {
-                List<DigitalTwinsModelData> convertedList = listResponse.getValue().stream()
+                Iterable<DigitalTwinsModelData> convertedList = listResponse.getValue().stream()
                     .map(ModelDataConverter::map)
                     .collect(Collectors.toList());
 

diff --git a/...azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsClient.java b/...azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsClient.java
@@ -344,7 +344,7 @@ public PagedIterable<IncomingRelationship> listIncomingRelationships(String digi
      * will contain metadata about the created model, but will not contain the model itself.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public List<DigitalTwinsModelData> createModels(List<String> models) {
+    public Iterable<DigitalTwinsModelData> createModels(Iterable<String> models) {
         return createModelsWithResponse(models, Context.NONE).getValue();
     }
 
@@ -356,7 +356,7 @@ public List<DigitalTwinsModelData> createModels(List<String> models) {
      * will contain metadata about the created model, but will not contain the model itself.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public Response<List<DigitalTwinsModelData>> createModelsWithResponse(List<String> models, Context context) {
+    public Response<Iterable<DigitalTwinsModelData>> createModelsWithResponse(Iterable<String> models, Context context) {
         return digitalTwinsAsyncClient.createModelsWithResponse(models, context).block();
     }
 

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
@@ -75,7 +75,7 @@ public static void runComponentSample() throws JsonProcessingException {
 
         ConsoleLogger.printHeader("Create Models");
         // We now create all the models (including components)
-        List<DigitalTwinsModelData> modelList =  client.createModels(modelsList);
+        Iterable<DigitalTwinsModelData> modelList =  client.createModels(modelsList);
 
         for (DigitalTwinsModelData model : modelList) {
             ConsoleLogger.print("Created model: " + model.getId());

diff --git a/...ltwins-core/src/samples/java/com/azure/digitaltwins/core/PublishTelemetrySyncSamples.java b/...ltwins-core/src/samples/java/com/azure/digitaltwins/core/PublishTelemetrySyncSamples.java
@@ -70,7 +70,7 @@ public static void runPublishTelemetrySample() throws JsonProcessingException {
 
         ConsoleLogger.printHeader("Create Models");
         // We now create all the models (including components)
-        List<DigitalTwinsModelData> modelList =  client.createModels(modelsList);
+        Iterable<DigitalTwinsModelData> modelList =  client.createModels(modelsList);
 
         for (DigitalTwinsModelData model : modelList) {
             ConsoleLogger.print("Created model: " + model.getId());

diff --git a/...italtwins-core/src/samples/java/com/azure/digitaltwins/core/RelationshipsSyncSamples.java b/...italtwins-core/src/samples/java/com/azure/digitaltwins/core/RelationshipsSyncSamples.java
@@ -76,7 +76,7 @@ public static void runRelationshipsSample() throws JsonProcessingException {
             .replace(SamplesConstants.RELATIONSHIP_NAME, "containedIn")
             .replace(SamplesConstants.RELATIONSHIP_TARGET_MODEL_ID, sampleBuildingModelId);
 
-        List<DigitalTwinsModelData> createdModels = client.createModels(new ArrayList<>(Arrays.asList(buildingModelPayload, floorModelPayload)));
+        Iterable<DigitalTwinsModelData> createdModels = client.createModels(new ArrayList<>(Arrays.asList(buildingModelPayload, floorModelPayload)));
 
         for (DigitalTwinsModelData model : createdModels) {
             ConsoleLogger.print("Created model " + model.getId());

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
@@ -44,7 +44,7 @@ public void componentLifecycleTest(HttpClient httpClient, DigitalTwinsServiceVer
             // Create models and components to test the lifecycle.
             StepVerifier
                 .create(asyncClient.createModels(modelsList))
-                .assertNext(createResponseList -> logger.info("Created {} models successfully", createResponseList.size()))
+                .assertNext(createResponseList -> logger.info("Created models successfully"))
                 .verifyComplete();
 
             StepVerifier.create(asyncClient.createDigitalTwin(roomWithWifiTwinId, deserializeJsonString(roomWithWifiTwin, BasicDigitalTwin.class), BasicDigitalTwin.class))

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
@@ -46,8 +46,8 @@ public void componentLifecycleTest(HttpClient httpClient, DigitalTwinsServiceVer
 
         try {
             // Create models and components to test the lifecycle.
-            List<DigitalTwinsModelData> createdList = client.createModels(modelsList);
-            logger.info("Created {} models successfully", createdList.size());
+            Iterable<DigitalTwinsModelData> createdList = client.createModels(modelsList);
+            logger.info("Created models successfully");
 
             BasicDigitalTwin createdTwin = client.createDigitalTwin(roomWithWifiTwinId, deserializeJsonString(roomWithWifiTwin, BasicDigitalTwin.class), BasicDigitalTwin.class);
 

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
@@ -53,7 +53,7 @@ public void relationshipLifecycleTest(HttpClient httpClient, DigitalTwinsService
                 hvacModelId,
                 modelsList -> StepVerifier
                     .create(asyncClient.createModels(modelsList))
-                    .assertNext(createResponseList -> logger.info("Created {} models successfully", createResponseList.size()))
+                    .assertNext(createResponseList -> logger.info("Created models successfully"))
                     .verifyComplete());
 
             // Create floor twin

diff --git a/...taltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipTest.java b/...taltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipTest.java
@@ -54,8 +54,8 @@ public void relationshipLifecycleTest(HttpClient httpClient, DigitalTwinsService
                 roomModelId,
                 hvacModelId,
                 modelsList -> {
-                    List<DigitalTwinsModelData> createdModels = client.createModels(modelsList);
-                    logger.info("Created {} models successfully", createdModels.size());
+                    Iterable<DigitalTwinsModelData> createdModels = client.createModels(modelsList);
+                    logger.info("Created models successfully");
                 }
             );
 

diff --git a/...ns/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ModelsAsyncTest.java b/...ns/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ModelsAsyncTest.java
@@ -34,8 +34,8 @@ public void modelLifecycleTest(HttpClient httpClient, DigitalTwinsServiceVersion
         List<DigitalTwinsModelData> createdModels = new ArrayList<>();
         createModelsRunner(asyncClient, (modelsList) -> StepVerifier.create(asyncClient.createModels(modelsList))
             .assertNext(createdModelsResponseList -> {
-                createdModels.addAll(createdModelsResponseList);
-                logger.info("Created {} models successfully", createdModelsResponseList.size());
+                createdModelsResponseList.forEach(item -> createdModels.add(item));
+                logger.info("Created {} models successfully");
             })
             .verifyComplete());
 

diff --git a/...altwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ModelsTest.java b/...altwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ModelsTest.java
@@ -33,10 +33,10 @@ public void modelLifecycleTest(HttpClient httpClient, DigitalTwinsServiceVersion
         // Create some models to test the lifecycle of
         final List<DigitalTwinsModelData> createdModels = new ArrayList<>();
         createModelsRunner(client, (modelsList) -> {
-            List<DigitalTwinsModelData> createdModelsResponseList = client.createModels(modelsList);
+            Iterable<DigitalTwinsModelData> createdModelsResponseList = client.createModels(modelsList);
             createdModelsResponseList.forEach((modelData) -> {
                 createdModels.add(modelData);
-                logger.info("Created {} models successfully", createdModelsResponseList.size());
+                logger.info("Created models successfully");
             });
         });
 
@@ -89,7 +89,7 @@ public void createModelThrowsIfModelAlreadyExists(HttpClient httpClient, Digital
         final String wardModelPayload = TestAssetsHelper.getWardModelPayload(wardModelId);
         modelsToCreate.add(wardModelPayload);
 
-        List<DigitalTwinsModelData> createdModels = client.createModels(modelsToCreate);
+        Iterable<DigitalTwinsModelData> createdModels = client.createModels(modelsToCreate);
         createdModels.forEach(Assertions::assertNotNull);
 
         assertRestException(

diff --git a/...gitaltwins-core/src/test/java/com/azure/digitaltwins/core/PublishTelemetryAsyncTests.java b/...gitaltwins-core/src/test/java/com/azure/digitaltwins/core/PublishTelemetryAsyncTests.java
@@ -95,7 +95,7 @@ private void createModelsAndTwins(DigitalTwinsAsyncClient asyncClient, String wi
 
         StepVerifier
             .create(asyncClient.createModels(new ArrayList<>(Arrays.asList(wifiModelPayload, roomWithWifiModelPayload))))
-            .assertNext(createResponseList -> logger.info("Created {} models successfully", createResponseList.size()))
+            .assertNext(createResponseList -> logger.info("Created models successfully"))
             .verifyComplete();
 
         String roomWithWifiTwinPayload = TestAssetsHelper.getRoomWithWifiTwinPayload(roomWithWifiModelId, TestAssetDefaults.WIFI_COMPONENT_NAME);

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
@@ -35,9 +35,9 @@ public void validQuerySucceeds(HttpClient httpClient, DigitalTwinsServiceVersion
 
             StepVerifier.create(asyncClient.createModels(new ArrayList<>(Arrays.asList(roomModelPayload))))
                 .assertNext(response ->
-                    assertThat(response.size())
+                    assertThat(response)
                         .as("Created models successfully")
-                        .isEqualTo(1))
+                        .isNotEmpty())
                 .verifyComplete();
 
             // Create a room twin with property "IsOccupied" : true

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
@@ -42,7 +42,7 @@ public void digitalTwinLifecycle(HttpClient httpClient, DigitalTwinsServiceVersi
             // Create models to test the Twin lifecycle.
             StepVerifier
                 .create(asyncClient.createModels(modelsList))
-                .assertNext(createResponseList -> logger.info("Created {} models successfully", createResponseList.size()))
+                .assertNext(createResponseList -> logger.info("Created models successfully"))
                 .verifyComplete();
 
             // Create a Twin

diff --git a/...taltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/TwinTests.java b/...taltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/TwinTests.java
@@ -41,8 +41,8 @@ public void digitalTwinLifecycle(HttpClient httpClient, DigitalTwinsServiceVersi
 
         try {
             // Create models to test the Twin lifecycle.
-            List<DigitalTwinsModelData> createdList = client.createModels(modelsList);
-            logger.info("Created {} models successfully", createdList.size());
+            Iterable<DigitalTwinsModelData> createdList = client.createModels(modelsList);
+            logger.info("Created models successfully");
 
             BasicDigitalTwin createdTwin = client.createDigitalTwin(roomTwinId, deserializeJsonString(roomTwin, BasicDigitalTwin.class), BasicDigitalTwin.class);