diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BridgeInternal.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BridgeInternal.java index afcd24c3e92c..bb7fff79c054 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BridgeInternal.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BridgeInternal.java @@ -467,11 +467,6 @@ public static CosmosAsyncPermission createCosmosAsyncPermission(String id, Cosmo return new CosmosAsyncPermission(id, user); } - @Warning(value = INTERNAL_USE_ONLY_WARNING) - public static CosmosAsyncTrigger createCosmosAsyncTrigger(String id, CosmosAsyncContainer container) { - return new CosmosAsyncTrigger(id, container); - } - @Warning(value = INTERNAL_USE_ONLY_WARNING) public static CosmosAsyncUserDefinedFunction createCosmosAsyncUserDefinedFunction(String id, CosmosAsyncContainer container) { return new CosmosAsyncUserDefinedFunction(id, container); diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java index 6ece9af3d8c4..e6dc4fc498a8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java @@ -544,7 +544,7 @@ public CosmosAsyncContainer getContainer(String id) { */ public Mono createUser(CosmosUserProperties userProperties) { return getDocClientWrapper().createUser(this.getLink(), ModelBridgeInternal.getV2User(userProperties), null) - .map(response -> ModelBridgeInternal.createCosmosAsyncUserResponse(response)).single(); + .map(response -> ModelBridgeInternal.createCosmosUserResponse(response)).single(); } @@ -561,7 +561,7 @@ public Mono createUser(CosmosUserProperties userProperties) */ public Mono upsertUser(CosmosUserProperties userProperties) { return getDocClientWrapper().upsertUser(this.getLink(), ModelBridgeInternal.getV2User(userProperties), null) - .map(response -> ModelBridgeInternal.createCosmosAsyncUserResponse(response)).single(); + .map(response -> ModelBridgeInternal.createCosmosUserResponse(response)).single(); } /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncScripts.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncScripts.java index 0a82c56cb46f..d2f9ff2a350d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncScripts.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncScripts.java @@ -6,7 +6,7 @@ import com.azure.cosmos.implementation.Trigger; import com.azure.cosmos.implementation.UserDefinedFunction; import com.azure.cosmos.models.CosmosStoredProcedureResponse; -import com.azure.cosmos.models.CosmosAsyncTriggerResponse; +import com.azure.cosmos.models.CosmosTriggerResponse; import com.azure.cosmos.models.CosmosUserDefinedFunctionResponse; import com.azure.cosmos.models.CosmosStoredProcedureProperties; import com.azure.cosmos.models.CosmosStoredProcedureRequestOptions; @@ -304,12 +304,12 @@ public CosmosAsyncUserDefinedFunction getUserDefinedFunction(String id) { * @param properties the cosmos trigger properties * @return an {@link Mono} containing the single resource response with the created trigger or an error. */ - public Mono createTrigger(CosmosTriggerProperties properties) { + public Mono createTrigger(CosmosTriggerProperties properties) { Trigger trigger = new Trigger(ModelBridgeInternal.toJsonFromJsonSerializable(ModelBridgeInternal.getResource(properties))); return database.getDocClientWrapper() .createTrigger(container.getLink(), trigger, null) - .map(response -> ModelBridgeInternal.createCosmosAsyncTriggerResponse(response, this.container)) + .map(response -> ModelBridgeInternal.createCosmosTriggerResponse(response)) .single(); } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTrigger.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTrigger.java index fe8afc8a5928..8809d531979e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTrigger.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTrigger.java @@ -4,7 +4,7 @@ import com.azure.cosmos.implementation.Paths; import com.azure.cosmos.implementation.Trigger; -import com.azure.cosmos.models.CosmosAsyncTriggerResponse; +import com.azure.cosmos.models.CosmosTriggerResponse; import com.azure.cosmos.models.CosmosTriggerProperties; import com.azure.cosmos.models.ModelBridgeInternal; import reactor.core.publisher.Mono; @@ -51,11 +51,11 @@ CosmosAsyncTrigger setId(String id) { * * @return an {@link Mono} containing the single resource response for the read cosmos trigger or an error. */ - public Mono read() { + public Mono read() { return container.getDatabase() .getDocClientWrapper() .readTrigger(getLink(), null) - .map(response -> ModelBridgeInternal.createCosmosAsyncTriggerResponse(response, container)) + .map(response -> ModelBridgeInternal.createCosmosTriggerResponse(response)) .single(); } @@ -70,12 +70,12 @@ public Mono read() { * @param triggerSettings the cosmos trigger properties. * @return an {@link Mono} containing the single resource response with the replaced cosmos trigger or an error. */ - public Mono replace(CosmosTriggerProperties triggerSettings) { + public Mono replace(CosmosTriggerProperties triggerSettings) { return container.getDatabase() .getDocClientWrapper() .replaceTrigger(new Trigger(ModelBridgeInternal.toJsonFromJsonSerializable( ModelBridgeInternal.getResource(triggerSettings))), null) - .map(response -> ModelBridgeInternal.createCosmosAsyncTriggerResponse(response, container)) + .map(response -> ModelBridgeInternal.createCosmosTriggerResponse(response)) .single(); } @@ -88,11 +88,11 @@ public Mono replace(CosmosTriggerProperties triggerS * * @return an {@link Mono} containing the single resource response for the deleted cosmos trigger or an error. */ - public Mono delete() { + public Mono delete() { return container.getDatabase() .getDocClientWrapper() .deleteTrigger(getLink(), null) - .map(response -> ModelBridgeInternal.createCosmosAsyncTriggerResponse(response, container)) + .map(response -> ModelBridgeInternal.createCosmosTriggerResponse(response)) .single(); } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUser.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUser.java index 8bd7dd0738d0..1de782768192 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUser.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUser.java @@ -57,8 +57,8 @@ CosmosAsyncUser setId(String id) { */ public Mono read() { return this.database.getDocClientWrapper() - .readUser(getLink(), null) - .map(response -> ModelBridgeInternal.createCosmosAsyncUserResponse(response)).single(); + .readUser(getLink(), null) + .map(response -> ModelBridgeInternal.createCosmosUserResponse(response)).single(); } /** @@ -69,8 +69,8 @@ public Mono read() { */ public Mono replace(CosmosUserProperties userSettings) { return this.database.getDocClientWrapper() - .replaceUser(ModelBridgeInternal.getV2User(userSettings), null) - .map(response -> ModelBridgeInternal.createCosmosAsyncUserResponse(response)).single(); + .replaceUser(ModelBridgeInternal.getV2User(userSettings), null) + .map(response -> ModelBridgeInternal.createCosmosUserResponse(response)).single(); } /** @@ -80,8 +80,8 @@ public Mono replace(CosmosUserProperties userSettings) { */ public Mono delete() { return this.database.getDocClientWrapper() - .deleteUser(getLink(), null) - .map(response -> ModelBridgeInternal.createCosmosAsyncUserResponse(response)).single(); + .deleteUser(getLink(), null) + .map(response -> ModelBridgeInternal.createCosmosUserResponse(response)).single(); } /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosScripts.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosScripts.java index 9c08938f7223..0db50a44f904 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosScripts.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosScripts.java @@ -4,15 +4,13 @@ package com.azure.cosmos; import com.azure.cosmos.models.CosmosStoredProcedureResponse; -import com.azure.cosmos.models.CosmosAsyncTriggerResponse; +import com.azure.cosmos.models.CosmosTriggerResponse; import com.azure.cosmos.models.CosmosUserDefinedFunctionResponse; import com.azure.cosmos.models.CosmosStoredProcedureProperties; import com.azure.cosmos.models.CosmosStoredProcedureRequestOptions; import com.azure.cosmos.models.CosmosTriggerProperties; -import com.azure.cosmos.models.CosmosTriggerResponse; import com.azure.cosmos.models.CosmosUserDefinedFunctionProperties; import com.azure.cosmos.models.FeedOptions; -import com.azure.cosmos.models.ModelBridgeInternal; import com.azure.cosmos.models.SqlQuerySpec; import com.azure.cosmos.util.CosmosPagedFlux; import com.azure.cosmos.util.CosmosPagedIterable; @@ -309,11 +307,9 @@ CosmosUserDefinedFunctionResponse mapUDFResponseAndBlock( * @param responseMono the response mono * @return the cosmos sync trigger response */ - CosmosTriggerResponse mapTriggerResponseAndBlock(Mono responseMono) { + CosmosTriggerResponse mapTriggerResponseAndBlock(Mono responseMono) { try { - return responseMono - .map(this::convertResponse) - .block(); + return responseMono.block(); } catch (Exception ex) { final Throwable throwable = Exceptions.unwrap(ex); if (throwable instanceof CosmosException) { @@ -324,21 +320,6 @@ CosmosTriggerResponse mapTriggerResponseAndBlock(Mono CosmosPagedIterable getCosmosPagedIterable(CosmosPagedFlux cosmosPagedFlux) { return UtilBridgeInternal.createCosmosPagedIterable(cosmosPagedFlux); } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTrigger.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTrigger.java index 11df5a262ea7..538644554059 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTrigger.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTrigger.java @@ -3,8 +3,8 @@ package com.azure.cosmos; -import com.azure.cosmos.models.CosmosTriggerProperties; import com.azure.cosmos.models.CosmosTriggerResponse; +import com.azure.cosmos.models.CosmosTriggerProperties; /** * The type Cosmos sync trigger. diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosAsyncTriggerResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosAsyncTriggerResponse.java deleted file mode 100644 index 7232c54d6d23..000000000000 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosAsyncTriggerResponse.java +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -package com.azure.cosmos.models; - -import com.azure.cosmos.BridgeInternal; -import com.azure.cosmos.CosmosAsyncContainer; -import com.azure.cosmos.CosmosAsyncTrigger; -import com.azure.cosmos.implementation.ResourceResponse; -import com.azure.cosmos.implementation.Trigger; -import com.azure.cosmos.implementation.apachecommons.lang.StringUtils; - -/** - * The type Cosmos async trigger response. - */ -public class CosmosAsyncTriggerResponse extends CosmosResponse { - - private final CosmosTriggerProperties cosmosTriggerProperties; - private final CosmosAsyncTrigger cosmosTrigger; - - CosmosAsyncTriggerResponse(ResourceResponse response, CosmosAsyncContainer container) { - super(response); - String bodyAsString = response.getBodyAsString(); - if (StringUtils.isEmpty(bodyAsString)) { - cosmosTriggerProperties = null; - cosmosTrigger = null; - } else { - cosmosTriggerProperties = new CosmosTriggerProperties(bodyAsString); - cosmosTrigger = BridgeInternal.createCosmosAsyncTrigger(cosmosTriggerProperties.getId(), container); - } - } - - /** - * Gets the cosmos trigger properties or null - * - * @return {@link CosmosTriggerProperties} - */ - public CosmosTriggerProperties getProperties() { - return cosmosTriggerProperties; - } - - /** - * Gets the cosmos trigger object or null - * - * @return {@link CosmosAsyncTrigger} - */ - public CosmosAsyncTrigger getTrigger() { - return cosmosTrigger; - } -} diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosTriggerResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosTriggerResponse.java index aa7515424cb0..5d02c5524315 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosTriggerResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosTriggerResponse.java @@ -1,46 +1,34 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - package com.azure.cosmos.models; -import com.azure.cosmos.CosmosTrigger; +import com.azure.cosmos.implementation.ResourceResponse; +import com.azure.cosmos.implementation.Trigger; +import com.azure.cosmos.implementation.apachecommons.lang.StringUtils; /** - * The type Cosmos sync trigger response. + * The type Cosmos async trigger response. */ public class CosmosTriggerResponse extends CosmosResponse { - private final CosmosTrigger syncTrigger; - private final CosmosAsyncTriggerResponse asyncResponse; + private final CosmosTriggerProperties cosmosTriggerProperties; - /** - * Instantiates a new Cosmos sync trigger response. - * - * @param asyncResponse the async response - * @param syncTrigger the sync trigger - */ - CosmosTriggerResponse(CosmosAsyncTriggerResponse asyncResponse, - CosmosTrigger syncTrigger) { - super(asyncResponse.resourceResponseWrapper, asyncResponse.getProperties()); - this.asyncResponse = asyncResponse; - this.syncTrigger = syncTrigger; + CosmosTriggerResponse(ResourceResponse response) { + super(response); + String bodyAsString = response.getBodyAsString(); + if (StringUtils.isEmpty(bodyAsString)) { + cosmosTriggerProperties = null; + } else { + cosmosTriggerProperties = new CosmosTriggerProperties(bodyAsString); + } } /** - * Gets cosmos trigger properties. + * Gets the cosmos trigger properties or null * - * @return the cosmos trigger properties + * @return {@link CosmosTriggerProperties} */ public CosmosTriggerProperties getProperties() { - return asyncResponse.getProperties(); - } - - /** - * Gets cosmos sync trigger. - * - * @return the cosmos sync trigger - */ - public CosmosTrigger getTrigger() { - return syncTrigger; + return cosmosTriggerProperties; } } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ModelBridgeInternal.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ModelBridgeInternal.java index 882d146d9676..70116b1c00ab 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ModelBridgeInternal.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ModelBridgeInternal.java @@ -3,8 +3,6 @@ package com.azure.cosmos.models; -import com.azure.cosmos.CosmosAsyncContainer; -import com.azure.cosmos.CosmosTrigger; import com.azure.cosmos.implementation.Conflict; import com.azure.cosmos.implementation.ConsistencyPolicy; import com.azure.cosmos.implementation.CosmosItemProperties; @@ -113,9 +111,8 @@ public static CosmosPermissionProperties createCosmosPermissionProperties(String } @Warning(value = INTERNAL_USE_ONLY_WARNING) - public static CosmosAsyncTriggerResponse createCosmosAsyncTriggerResponse(ResourceResponse response, - CosmosAsyncContainer container) { - return new CosmosAsyncTriggerResponse(response, container); + public static CosmosTriggerResponse createCosmosTriggerResponse(ResourceResponse response) { + return new CosmosTriggerResponse(response); } @Warning(value = INTERNAL_USE_ONLY_WARNING) @@ -124,7 +121,7 @@ public static CosmosUserDefinedFunctionResponse createCosmosUserDefinedFunctionR } @Warning(value = INTERNAL_USE_ONLY_WARNING) - public static CosmosUserResponse createCosmosAsyncUserResponse(ResourceResponse response) { + public static CosmosUserResponse createCosmosUserResponse(ResourceResponse response) { return new CosmosUserResponse(response); } @@ -133,12 +130,6 @@ public static CosmosItemResponse createCosmosItemResponse(CosmosAsyncItem return new CosmosItemResponse<>(response); } - @Warning(value = INTERNAL_USE_ONLY_WARNING) - public static CosmosTriggerResponse createCosmosTriggerResponse(CosmosAsyncTriggerResponse asyncResponse, - CosmosTrigger syncTrigger) { - return new CosmosTriggerResponse(asyncResponse, syncTrigger); - } - @Warning(value = INTERNAL_USE_ONLY_WARNING) public static List getCosmosConflictPropertiesFromV2Results(List results) { return CosmosConflictProperties.getFromV2Results(results); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseValidator.java index 6940cc6f7886..bea4a80459da 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseValidator.java @@ -8,7 +8,7 @@ import com.azure.cosmos.models.CosmosDatabaseResponse; import com.azure.cosmos.models.CosmosPermissionResponse; import com.azure.cosmos.models.CosmosStoredProcedureResponse; -import com.azure.cosmos.models.CosmosAsyncTriggerResponse; +import com.azure.cosmos.models.CosmosTriggerResponse; import com.azure.cosmos.models.CosmosUserDefinedFunctionResponse; import com.azure.cosmos.models.CosmosUserResponse; import com.azure.cosmos.models.CosmosConflictProperties; @@ -76,8 +76,8 @@ private Resource getResource(T resourceResponse) { return ModelBridgeInternal.getResource(((CosmosContainerResponse)resourceResponse).getProperties()); } else if (resourceResponse instanceof CosmosStoredProcedureResponse) { return ModelBridgeInternal.getResource(((CosmosStoredProcedureResponse)resourceResponse).getProperties()); - } else if (resourceResponse instanceof CosmosAsyncTriggerResponse) { - return ModelBridgeInternal.getResource(((CosmosAsyncTriggerResponse)resourceResponse).getProperties()); + } else if (resourceResponse instanceof CosmosTriggerResponse) { + return ModelBridgeInternal.getResource(((CosmosTriggerResponse)resourceResponse).getProperties()); } else if (resourceResponse instanceof CosmosUserDefinedFunctionResponse) { return ModelBridgeInternal.getResource(((CosmosUserDefinedFunctionResponse)resourceResponse).getProperties()); } else if (resourceResponse instanceof CosmosUserResponse) { @@ -256,10 +256,10 @@ public void validate(T resourceResponse) { } public Builder withTriggerBody(String functionBody) { - validators.add(new CosmosResponseValidator() { + validators.add(new CosmosResponseValidator() { @Override - public void validate(CosmosAsyncTriggerResponse resourceResponse) { + public void validate(CosmosTriggerResponse resourceResponse) { assertThat(resourceResponse.getProperties().getBody()).isEqualTo(functionBody); } }); @@ -267,10 +267,10 @@ public void validate(CosmosAsyncTriggerResponse resourceResponse) { } public Builder withTriggerInternals(TriggerType type, TriggerOperation op) { - validators.add(new CosmosResponseValidator() { + validators.add(new CosmosResponseValidator() { @Override - public void validate(CosmosAsyncTriggerResponse resourceResponse) { + public void validate(CosmosTriggerResponse resourceResponse) { assertThat(resourceResponse.getProperties().getTriggerType()).isEqualTo(type); assertThat(resourceResponse.getProperties().getTriggerOperation()).isEqualTo(op); } diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosTriggerTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosTriggerTest.java index 5d6a877d1400..d1cc7345e5f9 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosTriggerTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosTriggerTest.java @@ -3,10 +3,9 @@ package com.azure.cosmos; -import com.azure.cosmos.models.CosmosTriggerProperties; import com.azure.cosmos.models.CosmosTriggerResponse; +import com.azure.cosmos.models.CosmosTriggerProperties; import com.azure.cosmos.models.FeedOptions; -import com.azure.cosmos.models.ModelBridgeInternal; import com.azure.cosmos.models.SqlQuerySpec; import com.azure.cosmos.models.TriggerOperation; import com.azure.cosmos.models.TriggerType; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerCrudTest.java index f25620843159..fe0680b378c5 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerCrudTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerCrudTest.java @@ -5,11 +5,10 @@ import com.azure.cosmos.CosmosAsyncClient; import com.azure.cosmos.CosmosAsyncContainer; import com.azure.cosmos.CosmosAsyncTrigger; -import com.azure.cosmos.models.CosmosAsyncTriggerResponse; +import com.azure.cosmos.models.CosmosTriggerResponse; import com.azure.cosmos.CosmosClientBuilder; import com.azure.cosmos.CosmosResponseValidator; import com.azure.cosmos.models.CosmosTriggerProperties; -import com.azure.cosmos.models.ModelBridgeInternal; import com.azure.cosmos.models.TriggerOperation; import com.azure.cosmos.models.TriggerType; import org.testng.annotations.AfterClass; @@ -40,10 +39,10 @@ public void createTrigger() throws Exception { trigger.setTriggerOperation(TriggerOperation.CREATE); trigger.setTriggerType(TriggerType.PRE); - Mono createObservable = createdCollection.getScripts().createTrigger(trigger); + Mono createObservable = createdCollection.getScripts().createTrigger(trigger); // validate trigger creation - CosmosResponseValidator validator = new CosmosResponseValidator.Builder() + CosmosResponseValidator validator = new CosmosResponseValidator.Builder() .withId(trigger.getId()) .withTriggerBody("function() {var x = 10;}") .withTriggerInternals(TriggerType.PRE, TriggerOperation.CREATE) @@ -60,14 +59,16 @@ public void readTrigger() throws Exception { trigger.setBody("function() {var x = 10;}"); trigger.setTriggerOperation(TriggerOperation.CREATE); trigger.setTriggerType(TriggerType.PRE); - CosmosAsyncTrigger readBackTrigger = createdCollection.getScripts().createTrigger(trigger).block().getTrigger(); + CosmosTriggerResponse readBackTriggerResponse = createdCollection.getScripts().createTrigger(trigger).block(); + CosmosAsyncTrigger readBackTrigger = + createdCollection.getScripts().getTrigger(readBackTriggerResponse.getProperties().getId()); // read trigger waitIfNeededForReplicasToCatchUp(getClientBuilder()); - Mono readObservable = readBackTrigger.read(); + Mono readObservable = readBackTrigger.read(); // validate read trigger - CosmosResponseValidator validator = new CosmosResponseValidator.Builder() + CosmosResponseValidator validator = new CosmosResponseValidator.Builder() .withId(trigger.getId()) .withTriggerBody("function() {var x = 10;}") .withTriggerInternals(TriggerType.PRE, TriggerOperation.CREATE) @@ -84,13 +85,15 @@ public void deleteTrigger() throws Exception { trigger.setBody("function() {var x = 10;}"); trigger.setTriggerOperation(TriggerOperation.CREATE); trigger.setTriggerType(TriggerType.PRE); - CosmosAsyncTrigger readBackTrigger = createdCollection.getScripts().createTrigger(trigger).block().getTrigger(); + CosmosTriggerResponse readBackTriggerResponse = createdCollection.getScripts().createTrigger(trigger).block(); + CosmosAsyncTrigger readBackTrigger = + createdCollection.getScripts().getTrigger(readBackTriggerResponse.getProperties().getId()); // delete trigger - Mono deleteObservable = readBackTrigger.delete(); + Mono deleteObservable = readBackTrigger.delete(); // validate delete trigger - CosmosResponseValidator validator = new CosmosResponseValidator.Builder() + CosmosResponseValidator validator = new CosmosResponseValidator.Builder() .nullResource() .build(); validateSuccess(deleteObservable, validator); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerUpsertReplaceTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerUpsertReplaceTest.java index 4f1a03e6c950..532cd87ea1eb 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerUpsertReplaceTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TriggerUpsertReplaceTest.java @@ -4,11 +4,10 @@ import com.azure.cosmos.CosmosAsyncClient; import com.azure.cosmos.CosmosAsyncContainer; -import com.azure.cosmos.models.CosmosAsyncTriggerResponse; +import com.azure.cosmos.models.CosmosTriggerResponse; import com.azure.cosmos.CosmosClientBuilder; import com.azure.cosmos.CosmosResponseValidator; import com.azure.cosmos.models.CosmosTriggerProperties; -import com.azure.cosmos.models.ModelBridgeInternal; import com.azure.cosmos.models.TriggerOperation; import com.azure.cosmos.models.TriggerType; import org.testng.annotations.AfterClass; @@ -43,10 +42,10 @@ public void replaceTrigger() throws Exception { // read trigger to validate creation waitIfNeededForReplicasToCatchUp(getClientBuilder()); - Mono readObservable = createdCollection.getScripts().getTrigger(readBackTrigger.getId()).read(); + Mono readObservable = createdCollection.getScripts().getTrigger(readBackTrigger.getId()).read(); // validate trigger creation - CosmosResponseValidator validatorForRead = new CosmosResponseValidator.Builder() + CosmosResponseValidator validatorForRead = new CosmosResponseValidator.Builder() .withId(readBackTrigger.getId()) .withTriggerBody("function() {var x = 10;}") .withTriggerInternals(TriggerType.PRE, TriggerOperation.CREATE) @@ -57,10 +56,10 @@ public void replaceTrigger() throws Exception { //update getTrigger readBackTrigger.setBody("function() {var x = 11;}"); - Mono updateObservable = createdCollection.getScripts().getTrigger(readBackTrigger.getId()).replace(readBackTrigger); + Mono updateObservable = createdCollection.getScripts().getTrigger(readBackTrigger.getId()).replace(readBackTrigger); // validate getTrigger replace - CosmosResponseValidator validatorForUpdate = new CosmosResponseValidator.Builder() + CosmosResponseValidator validatorForUpdate = new CosmosResponseValidator.Builder() .withId(readBackTrigger.getId()) .withTriggerBody("function() {var x = 11;}") .withTriggerInternals(TriggerType.PRE, TriggerOperation.CREATE)