Skip to content

Commit 12349f1

Browse files
micossowmicossow
committed
Reorganize packages
1 parent 96d9e49 commit 12349f1

26 files changed

+251
-302
lines changed

‎rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/aws/AmazonJavaSdkNewTestSuite.scala‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/client/package.scala‎

Lines changed: 0 additions & 164 deletions
This file was deleted.

rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/aws/CustomServerContextTests.scala renamed to rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/CustomServerContextTests.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package org.elasticmq.rest.sqs.aws
1+
package org.elasticmq.rest.sqs.integration
22

33
import org.elasticmq.NodeAddress
4-
import org.elasticmq.rest.sqs.client.{AwsSdkV2SqsClient, SqsClient}
4+
import org.elasticmq.rest.sqs.integration.client.{AwsSdkV2SqsClient, SqsClient}
5+
import org.elasticmq.rest.sqs.integration.multisdk.AmazonJavaMultiSdkTestBase
56
import org.elasticmq.rest.sqs.{SQSRestServer, SQSRestServerBuilder}
67
import org.scalatest.BeforeAndAfter
78
import software.amazon.awssdk.auth.credentials.{AwsBasicCredentials, StaticCredentialsProvider}
@@ -11,7 +12,7 @@ import software.amazon.awssdk.services.sqs.{SqsClient => AwsSqsClient}
1112
import java.net.URI
1213
import scala.util.Try
1314

14-
class CustomServerContextTests extends AmazonJavaSdkNewTestBase with BeforeAndAfter {
15+
class CustomServerContextTests extends AmazonJavaMultiSdkTestBase with BeforeAndAfter {
1516

1617
var testClient: SqsClient = _
1718
var clientV2: AwsSqsClient = _

rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/aws/SqlQueuePersistenceTests.scala renamed to rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/SqlQueuePersistenceTests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package org.elasticmq.rest.sqs.aws
1+
package org.elasticmq.rest.sqs.integration
22

33
import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
44
import org.apache.pekko.util.Timeout
55
import org.elasticmq.actor.QueueManagerActor
66
import org.elasticmq.actor.queue.QueueEvent
77
import org.elasticmq.actor.reply._
88
import org.elasticmq.persistence.sql.{GetAllMessages, SqlQueuePersistenceActor, SqlQueuePersistenceConfig}
9-
import org.elasticmq.rest.sqs.client._
9+
import org.elasticmq.rest.sqs.integration.client.{ApproximateNumberOfMessagesAttributeName, AwsSdkV2SqsClient, RedrivePolicyAttributeName, VisibilityTimeoutAttributeName}
1010
import org.elasticmq.rest.sqs.model.RedrivePolicy
1111
import org.elasticmq.rest.sqs.model.RedrivePolicyJson.format
1212
import org.elasticmq.rest.sqs.{SQSRestServer, SQSRestServerBuilder}

rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/client/AwsSdkV1SqsClient.scala renamed to rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/client/AwsSdkV1SqsClient.scala

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,8 @@
1-
package org.elasticmq.rest.sqs.client
1+
package org.elasticmq.rest.sqs.integration.client
22

33
import com.amazonaws.services.sqs.AmazonSQS
4-
import com.amazonaws.services.sqs.model.{
5-
BatchResultErrorEntry,
6-
CancelMessageMoveTaskRequest,
7-
ChangeMessageVisibilityBatchRequest,
8-
ChangeMessageVisibilityBatchRequestEntry,
9-
CreateQueueRequest,
10-
DeleteMessageBatchRequest,
11-
DeleteMessageBatchRequestEntry,
12-
GetQueueAttributesRequest,
13-
GetQueueUrlRequest,
14-
ListDeadLetterSourceQueuesRequest,
15-
ListMessageMoveTasksRequest,
16-
MessageAttributeValue,
17-
MessageSystemAttributeValue,
18-
PurgeQueueRequest,
19-
QueueDoesNotExistException,
20-
ReceiveMessageRequest,
21-
ResourceNotFoundException,
22-
SendMessageBatchRequest,
23-
SendMessageBatchRequestEntry,
24-
SendMessageRequest,
25-
StartMessageMoveTaskRequest,
26-
UnsupportedOperationException
27-
}
4+
import com.amazonaws.services.sqs.model.{BatchResultErrorEntry, CancelMessageMoveTaskRequest, ChangeMessageVisibilityBatchRequest, ChangeMessageVisibilityBatchRequestEntry, CreateQueueRequest, DeleteMessageBatchRequest, DeleteMessageBatchRequestEntry, GetQueueAttributesRequest, GetQueueUrlRequest, ListDeadLetterSourceQueuesRequest, ListMessageMoveTasksRequest, MessageAttributeValue, MessageSystemAttributeValue, PurgeQueueRequest, QueueDoesNotExistException, ReceiveMessageRequest, ResourceNotFoundException, SendMessageBatchRequest, SendMessageBatchRequestEntry, SendMessageRequest, StartMessageMoveTaskRequest, UnsupportedOperationException}
5+
import org.elasticmq.rest.sqs.integration.client.client.{ApproximateNumberOfMessagesMoved, Arn, MessageMoveTaskStatus, QueueUrl, TaskHandle}
286
import org.elasticmq.{BinaryMessageAttribute, MessageAttribute, NumberMessageAttribute, StringMessageAttribute}
297

308
import java.nio.ByteBuffer

rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/client/AwsSdkV2SqsClient.scala renamed to rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/client/AwsSdkV2SqsClient.scala

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,9 @@
1-
package org.elasticmq.rest.sqs.client
1+
package org.elasticmq.rest.sqs.integration.client
2+
3+
import org.elasticmq.rest.sqs.integration.client.client.{ApproximateNumberOfMessagesMoved, Arn, MessageMoveTaskStatus, QueueUrl, TaskHandle}
24
import org.elasticmq.{BinaryMessageAttribute, MessageAttribute, NumberMessageAttribute, StringMessageAttribute}
35
import software.amazon.awssdk.core.SdkBytes
4-
import software.amazon.awssdk.services.sqs.model.{
5-
AddPermissionRequest,
6-
BatchResultErrorEntry,
7-
CancelMessageMoveTaskRequest,
8-
ChangeMessageVisibilityBatchRequest,
9-
ChangeMessageVisibilityBatchRequestEntry,
10-
ChangeMessageVisibilityRequest,
11-
CreateQueueRequest,
12-
DeleteMessageBatchRequest,
13-
DeleteMessageBatchRequestEntry,
14-
DeleteMessageRequest,
15-
DeleteQueueRequest,
16-
GetQueueAttributesRequest,
17-
GetQueueUrlRequest,
18-
ListDeadLetterSourceQueuesRequest,
19-
ListMessageMoveTasksRequest,
20-
ListQueueTagsRequest,
21-
ListQueuesRequest,
22-
MessageAttributeValue,
23-
MessageSystemAttributeNameForSends,
24-
MessageSystemAttributeValue,
25-
PurgeQueueRequest,
26-
QueueDoesNotExistException,
27-
ReceiveMessageRequest,
28-
RemovePermissionRequest,
29-
ResourceNotFoundException,
30-
SendMessageBatchRequest,
31-
SendMessageBatchRequestEntry,
32-
SendMessageRequest,
33-
StartMessageMoveTaskRequest,
34-
TagQueueRequest,
35-
UnsupportedOperationException,
36-
UntagQueueRequest,
37-
MessageSystemAttributeName => SdkMessageSystemAttributeName,
38-
QueueAttributeName => AwsQueueAttributeName
39-
}
6+
import software.amazon.awssdk.services.sqs.model.{AddPermissionRequest, BatchResultErrorEntry, CancelMessageMoveTaskRequest, ChangeMessageVisibilityBatchRequest, ChangeMessageVisibilityBatchRequestEntry, ChangeMessageVisibilityRequest, CreateQueueRequest, DeleteMessageBatchRequest, DeleteMessageBatchRequestEntry, DeleteMessageRequest, DeleteQueueRequest, GetQueueAttributesRequest, GetQueueUrlRequest, ListDeadLetterSourceQueuesRequest, ListMessageMoveTasksRequest, ListQueueTagsRequest, ListQueuesRequest, MessageAttributeValue, MessageSystemAttributeNameForSends, MessageSystemAttributeValue, PurgeQueueRequest, QueueDoesNotExistException, ReceiveMessageRequest, RemovePermissionRequest, ResourceNotFoundException, SendMessageBatchRequest, SendMessageBatchRequestEntry, SendMessageRequest, StartMessageMoveTaskRequest, TagQueueRequest, UnsupportedOperationException, UntagQueueRequest, MessageSystemAttributeName => SdkMessageSystemAttributeName, QueueAttributeName => AwsQueueAttributeName}
407

418
import scala.collection.JavaConverters._
429

rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/client/HasSqsTestClient.scala renamed to rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/client/HasSqsTestClient.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.elasticmq.rest.sqs.client
1+
package org.elasticmq.rest.sqs.integration.client
22

33
trait HasSqsTestClient {
44

rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/client/SqsClient.scala renamed to rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/client/SqsClient.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
package org.elasticmq.rest.sqs.client
1+
package org.elasticmq.rest.sqs.integration.client
2+
23
import org.elasticmq.MessageAttribute
4+
import org.elasticmq.rest.sqs.integration.client.client.{ApproximateNumberOfMessagesMoved, Arn, QueueUrl, TaskHandle}
35

46
trait SqsClient {
57

rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/client/SqsClientError.scala renamed to rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/client/SqsClientError.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
package org.elasticmq.rest.sqs.client
1+
package org.elasticmq.rest.sqs.integration.client
22

33
case class SqsClientError(errorType: SqsClientErrorType, message: String)

0 commit comments

Comments
 (0)