Skip to content

Commit

Permalink
Merge branch 'main' into tjroach/notification-trampoline-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
tylerjroach committed Jun 8, 2022
2 parents 15290d5 + e970b10 commit 302147f
Show file tree
Hide file tree
Showing 499 changed files with 34,568 additions and 15,130 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand All @@ -26,8 +26,8 @@
* to send and receive messages in custom messaging applications. These APIs
* depend on the frameworks provided by the Amazon Chime SDK Identity APIs. For
* more information about the messaging APIs, see <a href=
* "https://docs.aws.amazon.com/chime/latest/APIReference/API_Operations_Amazon_Chime_SDK_Messaging"
* >Amazon Chime SDK messaging</a>
* "https://docs.aws.amazon.com/chime/latest/APIReference/API_Operations_Amazon_Chime_SDK_Messaging.html"
* >Amazon Chime SDK messaging</a>.
* </p>
**/
public interface AmazonChimeSDKMessaging {
Expand Down Expand Up @@ -1519,6 +1519,7 @@ PutChannelMembershipPreferencesResult putChannelMembershipPreferences(
* ChimeSDK Messaging.
* @throws BadRequestException
* @throws ForbiddenException
* @throws ConflictException
* @throws UnauthorizedClientException
* @throws ThrottledClientException
* @throws ServiceUnavailableException
Expand All @@ -1535,6 +1536,34 @@ RedactChannelMessageResult redactChannelMessage(
RedactChannelMessageRequest redactChannelMessageRequest) throws AmazonClientException,
AmazonServiceException;

/**
* <p>
* Allows an <code>AppInstanceUser</code> to search the channels that they
* belong to. The <code>AppInstanceUser</code> can search by membership or
* external ID. An <code>AppInstanceAdmin</code> can search across all
* channels within the <code>AppInstance</code>.
* </p>
*
* @param searchChannelsRequest
* @return searchChannelsResult The response from the SearchChannels service
* method, as returned by Amazon ChimeSDK Messaging.
* @throws BadRequestException
* @throws ForbiddenException
* @throws UnauthorizedClientException
* @throws ThrottledClientException
* @throws ServiceUnavailableException
* @throws ServiceFailureException
* @throws AmazonClientException If any internal errors are encountered
* inside the client while attempting to make the request or
* handle the response. For example if a network connection is
* not available.
* @throws AmazonServiceException If an error response is returned by Amazon
* ChimeSDK Messaging indicating either a problem with the data
* in the request, or a server side issue.
*/
SearchChannelsResult searchChannels(SearchChannelsRequest searchChannelsRequest)
throws AmazonClientException, AmazonServiceException;

/**
* <p>
* Sends a message to a particular channel that the member is a part of.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down Expand Up @@ -40,8 +40,8 @@
* to send and receive messages in custom messaging applications. These APIs
* depend on the frameworks provided by the Amazon Chime SDK Identity APIs. For
* more information about the messaging APIs, see <a href=
* "https://docs.aws.amazon.com/chime/latest/APIReference/API_Operations_Amazon_Chime_SDK_Messaging"
* >Amazon Chime SDK messaging</a>
* "https://docs.aws.amazon.com/chime/latest/APIReference/API_Operations_Amazon_Chime_SDK_Messaging.html"
* >Amazon Chime SDK messaging</a>.
* </p>
*/
public class AmazonChimeSDKMessagingClient extends AmazonWebServiceClient implements
Expand Down Expand Up @@ -2750,6 +2750,7 @@ public PutChannelMembershipPreferencesResult putChannelMembershipPreferences(
* ChimeSDK Messaging.
* @throws BadRequestException
* @throws ForbiddenException
* @throws ConflictException
* @throws UnauthorizedClientException
* @throws ThrottledClientException
* @throws ServiceUnavailableException
Expand Down Expand Up @@ -2793,6 +2794,60 @@ public RedactChannelMessageResult redactChannelMessage(
}
}

/**
* <p>
* Allows an <code>AppInstanceUser</code> to search the channels that they
* belong to. The <code>AppInstanceUser</code> can search by membership or
* external ID. An <code>AppInstanceAdmin</code> can search across all
* channels within the <code>AppInstance</code>.
* </p>
*
* @param searchChannelsRequest
* @return searchChannelsResult The response from the SearchChannels service
* method, as returned by Amazon ChimeSDK Messaging.
* @throws BadRequestException
* @throws ForbiddenException
* @throws UnauthorizedClientException
* @throws ThrottledClientException
* @throws ServiceUnavailableException
* @throws ServiceFailureException
* @throws AmazonClientException If any internal errors are encountered
* inside the client while attempting to make the request or
* handle the response. For example if a network connection is
* not available.
* @throws AmazonServiceException If an error response is returned by Amazon
* ChimeSDK Messaging indicating either a problem with the data
* in the request, or a server side issue.
*/
public SearchChannelsResult searchChannels(SearchChannelsRequest searchChannelsRequest)
throws AmazonServiceException, AmazonClientException {
ExecutionContext executionContext = createExecutionContext(searchChannelsRequest);
AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
awsRequestMetrics.startEvent(Field.ClientExecuteTime);
Request<SearchChannelsRequest> request = null;
Response<SearchChannelsResult> response = null;
try {
awsRequestMetrics.startEvent(Field.RequestMarshallTime);
try {
request = new SearchChannelsRequestMarshaller().marshall(searchChannelsRequest);
// Binds the request metrics to the current request.
request.setAWSRequestMetrics(awsRequestMetrics);
} finally {
awsRequestMetrics.endEvent(Field.RequestMarshallTime);
}
Unmarshaller<SearchChannelsResult, JsonUnmarshallerContext> unmarshaller = new SearchChannelsResultJsonUnmarshaller();
JsonResponseHandler<SearchChannelsResult> responseHandler = new JsonResponseHandler<SearchChannelsResult>(
unmarshaller);

response = invoke(request, responseHandler, executionContext);

return response.getAwsResponse();
} finally {
awsRequestMetrics.endEvent(Field.ClientExecuteTime);
endClientExecution(awsRequestMetrics, request, response, LOGGING_AWS_REQUEST_METRIC);
}
}

/**
* <p>
* Sends a message to a particular channel that the member is a part of.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,8 @@ public class AppInstanceUserMembershipSummary implements Serializable {

/**
* <p>
* The time at which a message was last read.
* The time at which an <code>AppInstanceUser</code> last marked a channel
* as read.
* </p>
*/
private java.util.Date readMarkerTimestamp;
Expand Down Expand Up @@ -139,11 +140,13 @@ public AppInstanceUserMembershipSummary withType(ChannelMembershipType type) {

/**
* <p>
* The time at which a message was last read.
* The time at which an <code>AppInstanceUser</code> last marked a channel
* as read.
* </p>
*
* @return <p>
* The time at which a message was last read.
* The time at which an <code>AppInstanceUser</code> last marked a
* channel as read.
* </p>
*/
public java.util.Date getReadMarkerTimestamp() {
Expand All @@ -152,11 +155,13 @@ public java.util.Date getReadMarkerTimestamp() {

/**
* <p>
* The time at which a message was last read.
* The time at which an <code>AppInstanceUser</code> last marked a channel
* as read.
* </p>
*
* @param readMarkerTimestamp <p>
* The time at which a message was last read.
* The time at which an <code>AppInstanceUser</code> last marked
* a channel as read.
* </p>
*/
public void setReadMarkerTimestamp(java.util.Date readMarkerTimestamp) {
Expand All @@ -165,14 +170,16 @@ public void setReadMarkerTimestamp(java.util.Date readMarkerTimestamp) {

/**
* <p>
* The time at which a message was last read.
* The time at which an <code>AppInstanceUser</code> last marked a channel
* as read.
* </p>
* <p>
* Returns a reference to this object so that method calls can be chained
* together.
*
* @param readMarkerTimestamp <p>
* The time at which a message was last read.
* The time at which an <code>AppInstanceUser</code> last marked
* a channel as read.
* </p>
* @return A reference to this updated object so that method calls can be
* chained together.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down

0 comments on commit 302147f

Please sign in to comment.