Merged cosmos trigger async response and cosmos trigger response types

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);

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.CosmosAsyncUserDefinedFunctionResponse;
 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<CosmosAsyncTriggerResponse> createTrigger(CosmosTriggerProperties properties) {
+    public Mono<CosmosTriggerResponse> 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();
     }
 

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<CosmosAsyncTriggerResponse> read() {
+    public Mono<CosmosTriggerResponse> 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<CosmosAsyncTriggerResponse> 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<CosmosAsyncTriggerResponse> replace(CosmosTriggerProperties triggerSettings) {
+    public Mono<CosmosTriggerResponse> 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<CosmosAsyncTriggerResponse> replace(CosmosTriggerProperties triggerS
      *
      * @return an {@link Mono} containing the single resource response for the deleted cosmos trigger or an error.
      */
-    public Mono<CosmosAsyncTriggerResponse> delete() {
+    public Mono<CosmosTriggerResponse> delete() {
         return container.getDatabase()
                    .getDocClientWrapper()
                    .deleteTrigger(getLink(), null)
-                   .map(response -> ModelBridgeInternal.createCosmosAsyncTriggerResponse(response, container))
+                   .map(response -> ModelBridgeInternal.createCosmosTriggerResponse(response))
                    .single();
     }
 

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosScripts.java

@@ -4,12 +4,11 @@
 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.CosmosAsyncUserDefinedFunctionResponse;
 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.CosmosUserDefinedFunctionResponse;
 import com.azure.cosmos.models.FeedOptions;
@@ -328,11 +327,9 @@ CosmosUserDefinedFunctionResponse convertResponse(CosmosAsyncUserDefinedFunction
      * @param responseMono the response mono
      * @return the cosmos sync trigger response
      */
-    CosmosTriggerResponse mapTriggerResponseAndBlock(Mono<CosmosAsyncTriggerResponse> responseMono) {
+    CosmosTriggerResponse mapTriggerResponseAndBlock(Mono<CosmosTriggerResponse> responseMono) {
         try {
-            return responseMono
-                       .map(this::convertResponse)
-                       .block();
+            return responseMono.block();
         } catch (Exception ex) {
             final Throwable throwable = Exceptions.unwrap(ex);
             if (throwable instanceof CosmosException) {
@@ -343,21 +340,6 @@ CosmosTriggerResponse mapTriggerResponseAndBlock(Mono<CosmosAsyncTriggerResponse
         }
     }
 
-    /**
-     * Convert response cosmos sync trigger response.
-     *
-     * @param response the response
-     * @return the cosmos sync trigger response
-     */
-    CosmosTriggerResponse convertResponse(CosmosAsyncTriggerResponse response) {
-        if (response.getTrigger() != null) {
-            return ModelBridgeInternal.createCosmosTriggerResponse(response,
-                                             getTrigger(response.getTrigger().getId()));
-        } else {
-            return ModelBridgeInternal.createCosmosTriggerResponse(response, null);
-        }
-    }
-
     private <T> CosmosPagedIterable<T> getCosmosPagedIterable(CosmosPagedFlux<T> cosmosPagedFlux) {
         return UtilBridgeInternal.createCosmosPagedIterable(cosmosPagedFlux);
     }

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.

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<CosmosTriggerProperties> {
 
-    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<Trigger> 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;
     }
 }

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ModelBridgeInternal.java

@@ -8,8 +8,6 @@
 import com.azure.cosmos.CosmosAsyncDatabase;
 import com.azure.cosmos.CosmosAsyncUser;
 import com.azure.cosmos.CosmosClient;
-import com.azure.cosmos.CosmosDatabase;
-import com.azure.cosmos.CosmosTrigger;
 import com.azure.cosmos.CosmosUserDefinedFunction;
 import com.azure.cosmos.implementation.Conflict;
 import com.azure.cosmos.implementation.ConsistencyPolicy;
@@ -123,9 +121,8 @@ public static CosmosPermissionProperties createCosmosPermissionProperties(String
     }
 
     @Warning(value = INTERNAL_USE_ONLY_WARNING)
-    public static CosmosAsyncTriggerResponse createCosmosAsyncTriggerResponse(ResourceResponse<Trigger> response,
-                                                                              CosmosAsyncContainer container) {
-        return new CosmosAsyncTriggerResponse(response, container);
+    public static CosmosTriggerResponse createCosmosTriggerResponse(ResourceResponse<Trigger> response) {
+        return new CosmosTriggerResponse(response);
     }
 
     @Warning(value = INTERNAL_USE_ONLY_WARNING)
@@ -155,12 +152,6 @@ public static CosmosUserDefinedFunctionResponse createCosmosUserDefinedFunctionR
         return new CosmosUserDefinedFunctionResponse(resourceResponse, userDefinedFunction);
     }
 
-    @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<CosmosConflictProperties> getCosmosConflictPropertiesFromV2Results(List<Conflict> results) {
         return CosmosConflictProperties.getFromV2Results(results);

sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseValidator.java

@@ -8,7 +8,7 @@
 import com.azure.cosmos.models.CosmosAsyncDatabaseResponse;
 import com.azure.cosmos.models.CosmosAsyncPermissionResponse;
 import com.azure.cosmos.models.CosmosStoredProcedureResponse;
-import com.azure.cosmos.models.CosmosAsyncTriggerResponse;
+import com.azure.cosmos.models.CosmosTriggerResponse;
 import com.azure.cosmos.models.CosmosAsyncUserDefinedFunctionResponse;
 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 CosmosAsyncUserDefinedFunctionResponse) {
                 return ModelBridgeInternal.getResource(((CosmosAsyncUserDefinedFunctionResponse)resourceResponse).getProperties());
             } else if (resourceResponse instanceof CosmosUserResponse) {
@@ -256,21 +256,21 @@ public void validate(T resourceResponse) {
         }
 
         public Builder<T> withTriggerBody(String functionBody) {
-            validators.add(new CosmosResponseValidator<CosmosAsyncTriggerResponse>() {
+            validators.add(new CosmosResponseValidator<CosmosTriggerResponse>() {
 
                 @Override
-                public void validate(CosmosAsyncTriggerResponse resourceResponse) {
+                public void validate(CosmosTriggerResponse resourceResponse) {
                     assertThat(resourceResponse.getProperties().getBody()).isEqualTo(functionBody);
                 }
             });
             return this;
         }
 
         public Builder<T> withTriggerInternals(TriggerType type, TriggerOperation op) {
-            validators.add(new CosmosResponseValidator<CosmosAsyncTriggerResponse>() {
+            validators.add(new CosmosResponseValidator<CosmosTriggerResponse>() {
 
                 @Override
-                public void validate(CosmosAsyncTriggerResponse resourceResponse) {
+                public void validate(CosmosTriggerResponse resourceResponse) {
                     assertThat(resourceResponse.getProperties().getTriggerType()).isEqualTo(type);
                     assertThat(resourceResponse.getProperties().getTriggerOperation()).isEqualTo(op);
                 }

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;