diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsAsyncClient.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsAsyncClient.java index c6e7539db0613..60e7424734807 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsAsyncClient.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsAsyncClient.java @@ -542,7 +542,7 @@ PagedFlux listIncomingRelationships(String digitalTwinId, * will contain metadata about the created model, but will not contain the model itself. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public Mono> createModels(List models) { + public Mono> createModels(Iterable models) { return createModelsWithResponse(models) .map(Response::getValue); } @@ -554,11 +554,11 @@ public Mono> createModels(List models) { * will contain metadata about the created model, but will not contain the model itself. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public Mono>> createModelsWithResponse(List models) { + public Mono>> createModelsWithResponse(Iterable models) { return withContext(context -> createModelsWithResponse(models, context)); } - Mono>> createModelsWithResponse(List models, Context context) { + Mono>> createModelsWithResponse(Iterable models, Context context) { List modelsPayload = new ArrayList<>(); for (String model: models) { try { @@ -572,7 +572,7 @@ Mono>> createModelsWithResponse(List { - List convertedList = listResponse.getValue().stream() + Iterable convertedList = listResponse.getValue().stream() .map(ModelDataConverter::map) .collect(Collectors.toList()); diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsClient.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsClient.java index 0e5512ae79556..b963ebfa77dd9 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsClient.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsClient.java @@ -344,7 +344,7 @@ public PagedIterable listIncomingRelationships(String digi * will contain metadata about the created model, but will not contain the model itself. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public List createModels(List models) { + public Iterable createModels(Iterable models) { return createModelsWithResponse(models, Context.NONE).getValue(); } @@ -356,7 +356,7 @@ public List createModels(List models) { * will contain metadata about the created model, but will not contain the model itself. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public Response> createModelsWithResponse(List models, Context context) { + public Response> createModelsWithResponse(Iterable models, Context context) { return digitalTwinsAsyncClient.createModelsWithResponse(models, context).block(); } 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 76e646d6c27f5..134105af6fd15 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 @@ -75,7 +75,7 @@ public static void runComponentSample() throws JsonProcessingException { ConsoleLogger.printHeader("Create Models"); // We now create all the models (including components) - List modelList = client.createModels(modelsList); + Iterable modelList = client.createModels(modelsList); for (DigitalTwinsModelData model : modelList) { ConsoleLogger.print("Created model: " + model.getId()); diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/PublishTelemetrySyncSamples.java b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/PublishTelemetrySyncSamples.java index d62e23e20fdfc..ca3a84c208bd0 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/PublishTelemetrySyncSamples.java +++ b/sdk/digitaltwins/azure-digitaltwins-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 modelList = client.createModels(modelsList); + Iterable modelList = client.createModels(modelsList); for (DigitalTwinsModelData model : modelList) { ConsoleLogger.print("Created model: " + model.getId()); 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 affd830560fa7..8b36e641f0b05 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 @@ -76,7 +76,7 @@ public static void runRelationshipsSample() throws JsonProcessingException { .replace(SamplesConstants.RELATIONSHIP_NAME, "containedIn") .replace(SamplesConstants.RELATIONSHIP_TARGET_MODEL_ID, sampleBuildingModelId); - List createdModels = client.createModels(new ArrayList<>(Arrays.asList(buildingModelPayload, floorModelPayload))); + Iterable createdModels = client.createModels(new ArrayList<>(Arrays.asList(buildingModelPayload, floorModelPayload))); for (DigitalTwinsModelData model : createdModels) { ConsoleLogger.print("Created model " + model.getId()); 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 e38ee9e086aed..a85813ca992f1 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 @@ -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/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 f91add0e069f9..f0052d4d86792 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 @@ -46,8 +46,8 @@ public void componentLifecycleTest(HttpClient httpClient, DigitalTwinsServiceVer try { // Create models and components to test the lifecycle. - List createdList = client.createModels(modelsList); - logger.info("Created {} models successfully", createdList.size()); + Iterable createdList = client.createModels(modelsList); + logger.info("Created models successfully"); BasicDigitalTwin createdTwin = client.createDigitalTwin(roomWithWifiTwinId, deserializeJsonString(roomWithWifiTwin, BasicDigitalTwin.class), BasicDigitalTwin.class); 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 049fd6d4ad5e5..79528aea9438a 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 @@ -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/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipTest.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipTest.java index 098fa1a87a410..eb29c0408804d 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipTest.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsRelationshipTest.java @@ -54,8 +54,8 @@ public void relationshipLifecycleTest(HttpClient httpClient, DigitalTwinsService roomModelId, hvacModelId, modelsList -> { - List createdModels = client.createModels(modelsList); - logger.info("Created {} models successfully", createdModels.size()); + Iterable createdModels = client.createModels(modelsList); + logger.info("Created models successfully"); } ); diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ModelsAsyncTest.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ModelsAsyncTest.java index 7ca4fd04b233f..e6715ee1fa3e4 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ModelsAsyncTest.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ModelsAsyncTest.java @@ -34,8 +34,8 @@ public void modelLifecycleTest(HttpClient httpClient, DigitalTwinsServiceVersion List 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/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ModelsTest.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ModelsTest.java index e02ae91e4cbdc..898b23ca8f723 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/ModelsTest.java +++ b/sdk/digitaltwins/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 createdModels = new ArrayList<>(); createModelsRunner(client, (modelsList) -> { - List createdModelsResponseList = client.createModels(modelsList); + Iterable 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 createdModels = client.createModels(modelsToCreate); + Iterable createdModels = client.createModels(modelsToCreate); createdModels.forEach(Assertions::assertNotNull); assertRestException( diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/PublishTelemetryAsyncTests.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/PublishTelemetryAsyncTests.java index 9514ea48874df..23e9b101819c8 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/PublishTelemetryAsyncTests.java +++ b/sdk/digitaltwins/azure-digitaltwins-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/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 c1a65cbb4f40f..a3e5fa36630ef 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 @@ -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/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 4984bb9ab5fb1..a6cb08a44183a 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 @@ -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/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/TwinTests.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/TwinTests.java index 28506c10dc47f..a26e5484edc48 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/TwinTests.java +++ b/sdk/digitaltwins/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 createdList = client.createModels(modelsList); - logger.info("Created {} models successfully", createdList.size()); + Iterable createdList = client.createModels(modelsList); + logger.info("Created models successfully"); BasicDigitalTwin createdTwin = client.createDigitalTwin(roomTwinId, deserializeJsonString(roomTwin, BasicDigitalTwin.class), BasicDigitalTwin.class);