Skip to content

Commit

Permalink
Merge branch 'dev-ethomas-EUCA-12837'
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Thomas committed Oct 15, 2016
2 parents fe7ed54 + 1c02f98 commit 42ac981
Show file tree
Hide file tree
Showing 6 changed files with 146 additions and 80 deletions.
50 changes: 32 additions & 18 deletions ...es/simplequeue-common/src/main/java/com/eucalyptus/simplequeue/SimpleQueueMessages.groovy
View file
Expand Up @@ -27,11 +27,11 @@ import edu.ucsb.eucalyptus.msgs.GroovyAddClassUUID

import java.lang.reflect.Field

public class SimpleQueueMessageWithQueueUrl extends SimpleQueueMessage {
String queueUrl;
public SimpleQueueMessageWithQueueUrl() { }
}
public interface QueueUrlGetterSetter {
public void setQueueUrl(String queueUrl);
public String getQueueUrl();

}
public class CreateQueueType extends SimpleQueueMessage {
String queueName;
public CreateQueueType() { }
Expand All @@ -51,7 +51,8 @@ public class SendMessageBatchResultEntry extends EucalyptusData {
String mD5OfMessageAttributes;
public SendMessageBatchResultEntry() { }
}
public class RemovePermissionType extends SimpleQueueMessageWithQueueUrl {
public class RemovePermissionType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
String label;
public RemovePermissionType() { }
}
Expand All @@ -63,7 +64,8 @@ public class ListDeadLetterSourceQueuesResult extends EucalyptusData {
public ListDeadLetterSourceQueuesResult() { }
ArrayList<String> queueUrl = new ArrayList<String>();
}
public class ChangeMessageVisibilityType extends SimpleQueueMessageWithQueueUrl {
public class ChangeMessageVisibilityType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
String receiptHandle;
Integer visibilityTimeout;
public ChangeMessageVisibilityType() { }
Expand All @@ -82,7 +84,8 @@ public class SendMessageBatchResponseType extends SimpleQueueMessage {
SendMessageBatchResult sendMessageBatchResult = new SendMessageBatchResult();
ResponseMetadata responseMetadata = new ResponseMetadata();
}
public class SetQueueAttributesType extends SimpleQueueMessageWithQueueUrl {
public class SetQueueAttributesType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
public SetQueueAttributesType() { }
@HttpEmbedded(multiple=true)
ArrayList<Attribute> attribute = new ArrayList<Attribute>();
Expand All @@ -108,7 +111,8 @@ public class ChangeMessageVisibilityBatchRequestEntry extends EucalyptusData {
Integer visibilityTimeout;
public ChangeMessageVisibilityBatchRequestEntry() { }
}
public class SendMessageType extends SimpleQueueMessageWithQueueUrl {
public class SendMessageType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
String messageBody;
Integer delaySeconds;
public SendMessageType() { }
Expand All @@ -122,7 +126,8 @@ public class DeleteMessageBatchResult extends EucalyptusData {
ArrayList<DeleteMessageBatchResultEntry> deleteMessageBatchResultEntry = new ArrayList<DeleteMessageBatchResultEntry>();
ArrayList<BatchResultErrorEntry> batchResultErrorEntry = new ArrayList<BatchResultErrorEntry>();
}
public class AddPermissionType extends SimpleQueueMessageWithQueueUrl {
public class AddPermissionType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
String label;
public AddPermissionType() { }
@HttpParameterMapping(parameter="AWSAccountId")
Expand All @@ -149,7 +154,8 @@ public class ChangeMessageVisibilityBatchResultEntry extends EucalyptusData {
public ChangeMessageVisibilityBatchResultEntry() { }
}
@PolicyAction(vendor=SimpleQueuePolicySpec.VENDOR_SIMPLEQUEUE, action=SimpleQueuePolicySpec.SIMPLEQUEUE_CHANGEMESSAGEVISIBILITY)
public class ChangeMessageVisibilityBatchType extends SimpleQueueMessageWithQueueUrl {
public class ChangeMessageVisibilityBatchType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
public ChangeMessageVisibilityBatchType() { }
@HttpEmbedded(multiple=true)
ArrayList<ChangeMessageVisibilityBatchRequestEntry> changeMessageVisibilityBatchRequestEntry = new ArrayList<ChangeMessageVisibilityBatchRequestEntry>();
Expand All @@ -158,7 +164,8 @@ public class GetQueueAttributesResult extends EucalyptusData {
public GetQueueAttributesResult() { }
ArrayList<Attribute> attribute = new ArrayList<Attribute>();
}
public class ListDeadLetterSourceQueuesType extends SimpleQueueMessageWithQueueUrl {
public class ListDeadLetterSourceQueuesType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
public ListDeadLetterSourceQueuesType() { }
}
public class SendMessageBatchRequestEntry extends EucalyptusData {
Expand All @@ -174,7 +181,8 @@ public class DeleteMessageBatchResponseType extends SimpleQueueMessage {
DeleteMessageBatchResult deleteMessageBatchResult = new DeleteMessageBatchResult();
ResponseMetadata responseMetadata = new ResponseMetadata();
}
public class GetQueueAttributesType extends SimpleQueueMessageWithQueueUrl {
public class GetQueueAttributesType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
String unused;
public GetQueueAttributesType() { }
ArrayList<String> attributeName = new ArrayList<String>();
Expand All @@ -184,12 +192,14 @@ public class MessageAttribute extends EucalyptusData {
MessageAttributeValue value;
public MessageAttribute() { }
}
public class DeleteQueueType extends SimpleQueueMessageWithQueueUrl {
public class DeleteQueueType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
public DeleteQueueType() { }
@HttpEmbedded(multiple=true)
ArrayList<Attribute> attribute = new ArrayList<Attribute>();
}
public class PurgeQueueType extends SimpleQueueMessageWithQueueUrl {
public class PurgeQueueType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
public PurgeQueueType() { }
@HttpEmbedded(multiple=true)
ArrayList<Attribute> attribute = new ArrayList<Attribute>();
Expand Down Expand Up @@ -282,7 +292,8 @@ public class SendMessageResponseType extends SimpleQueueMessage {
SendMessageResult sendMessageResult = new SendMessageResult();
ResponseMetadata responseMetadata = new ResponseMetadata();
}
public class DeleteMessageType extends SimpleQueueMessageWithQueueUrl {
public class DeleteMessageType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
String receiptHandle;
public DeleteMessageType() { }
@HttpEmbedded(multiple=true)
Expand All @@ -301,7 +312,8 @@ public class ErrorDetail extends EucalyptusData {
public ErrorDetail() { }
}
@PolicyAction(vendor=SimpleQueuePolicySpec.VENDOR_SIMPLEQUEUE, action=SimpleQueuePolicySpec.SIMPLEQUEUE_SENDMESSAGE)
public class SendMessageBatchType extends SimpleQueueMessageWithQueueUrl {
public class SendMessageBatchType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
public SendMessageBatchType() { }
@HttpEmbedded(multiple=true)
ArrayList<SendMessageBatchRequestEntry> sendMessageBatchRequestEntry = new ArrayList<SendMessageBatchRequestEntry>();
Expand All @@ -311,12 +323,14 @@ public class ResponseMetadata extends EucalyptusData {
public ResponseMetadata() { }
}
@PolicyAction(vendor=SimpleQueuePolicySpec.VENDOR_SIMPLEQUEUE, action=SimpleQueuePolicySpec.SIMPLEQUEUE_DELETEMESSAGE)
public class DeleteMessageBatchType extends SimpleQueueMessageWithQueueUrl {
public class DeleteMessageBatchType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
public DeleteMessageBatchType() { }
@HttpEmbedded(multiple=true)
ArrayList<DeleteMessageBatchRequestEntry> deleteMessageBatchRequestEntry = new ArrayList<DeleteMessageBatchRequestEntry>();
}
public class ReceiveMessageType extends SimpleQueueMessageWithQueueUrl {
public class ReceiveMessageType extends SimpleQueueMessage implements QueueUrlGetterSetter {
String queueUrl;
Integer maxNumberOfMessages;
Integer visibilityTimeout;
Integer waitTimeSeconds;
Expand Down
14 changes: 14 additions & 0 deletions clc/modules/simplequeue-common/src/main/resources/simplequeue-binding.xml
View file
Expand Up @@ -52,6 +52,7 @@
</mapping>
<mapping name="ChangeMessageVisibility" class="com.eucalyptus.simplequeue.ChangeMessageVisibilityType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<value name="ReceiptHandle" field="receiptHandle" usage="required"/>
<value name="VisibilityTimeout" field="visibilityTimeout" usage="required"/>
<collection field="attribute">
Expand All @@ -64,6 +65,7 @@
</mapping>
<mapping name="DeleteMessage" class="com.eucalyptus.simplequeue.DeleteMessageType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<value name="ReceiptHandle" field="receiptHandle" usage="required"/>
<collection field="attribute">
<structure name="Attribute" type="com.eucalyptus.simplequeue.Attribute"/>
Expand All @@ -75,6 +77,7 @@
</mapping>
<mapping name="DeleteQueue" class="com.eucalyptus.simplequeue.DeleteQueueType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<collection field="attribute">
<structure name="Attribute" type="com.eucalyptus.simplequeue.Attribute"/>
</collection>
Expand All @@ -85,6 +88,7 @@
</mapping>
<mapping name="PurgeQueue" class="com.eucalyptus.simplequeue.PurgeQueueType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<collection field="attribute">
<structure name="Attribute" type="com.eucalyptus.simplequeue.Attribute"/>
</collection>
Expand All @@ -95,6 +99,7 @@
</mapping>
<mapping name="GetQueueAttributes" class="com.eucalyptus.simplequeue.GetQueueAttributesType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<collection field="attributeName">
<value name="AttributeName" type="java.lang.String"/>
</collection>
Expand All @@ -107,6 +112,7 @@
</mapping>
<mapping name="ReceiveMessage" class="com.eucalyptus.simplequeue.ReceiveMessageType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<value name="MaxNumberOfMessages" field="maxNumberOfMessages" usage="optional"/>
<value name="VisibilityTimeout" field="visibilityTimeout" usage="optional"/>
<value name="WaitTimeSeconds" field="waitTimeSeconds" usage="optional"/>
Expand All @@ -125,6 +131,7 @@
</mapping>
<mapping name="SendMessage" class="com.eucalyptus.simplequeue.SendMessageType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<value name="MessageBody" field="messageBody" usage="required"/>
<value name="DelaySeconds" field="delaySeconds" usage="optional"/>
<collection field="attribute">
Expand All @@ -141,6 +148,7 @@
</mapping>
<mapping name="SetQueueAttributes" class="com.eucalyptus.simplequeue.SetQueueAttributesType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<collection field="attribute">
<structure name="Attribute" type="com.eucalyptus.simplequeue.Attribute"/>
</collection>
Expand All @@ -162,6 +170,7 @@
</mapping>
<mapping name="ChangeMessageVisibilityBatch" class="com.eucalyptus.simplequeue.ChangeMessageVisibilityBatchType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<collection field="changeMessageVisibilityBatchRequestEntry">
<structure name="ChangeMessageVisibilityBatchRequestEntry" type="com.eucalyptus.simplequeue.ChangeMessageVisibilityBatchRequestEntry"/>
</collection>
Expand All @@ -188,6 +197,7 @@
</mapping>
<mapping name="DeleteMessageBatch" class="com.eucalyptus.simplequeue.DeleteMessageBatchType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<collection field="deleteMessageBatchRequestEntry">
<structure name="DeleteMessageBatchRequestEntry" type="com.eucalyptus.simplequeue.DeleteMessageBatchRequestEntry"/>
</collection>
Expand Down Expand Up @@ -218,6 +228,7 @@
</mapping>
<mapping name="SendMessageBatch" class="com.eucalyptus.simplequeue.SendMessageBatchType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<collection field="sendMessageBatchRequestEntry">
<structure name="SendMessageBatchRequestEntry" type="com.eucalyptus.simplequeue.SendMessageBatchRequestEntry"/>
</collection>
Expand All @@ -243,6 +254,7 @@
</mapping>
<mapping name="AddPermission" class="com.eucalyptus.simplequeue.AddPermissionType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<value name="Label" field="label" usage="required"/>
<collection field="awsAccountId">
<value name="AWSAccountId" type="java.lang.String"/>
Expand All @@ -257,13 +269,15 @@
</mapping>
<mapping name="RemovePermission" class="com.eucalyptus.simplequeue.RemovePermissionType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<value name="Label" field="label" usage="required"/>
</mapping>
<mapping name="RemovePermissionResponse" class="com.eucalyptus.simplequeue.RemovePermissionResponseType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
<structure name="ResponseMetadata" field="responseMetadata" usage="required" type="com.eucalyptus.simplequeue.ResponseMetadata"/>
</mapping>
<mapping name="ListDeadLetterSourceQueues" class="com.eucalyptus.simplequeue.ListDeadLetterSourceQueuesType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
<value name="QueueUrl" field="queueUrl" usage="optional"/>
<structure map-as="com.eucalyptus.simplequeue.SimpleQueueMessage"/>
</mapping>
<mapping name="ListDeadLetterSourceQueuesResponse" class="com.eucalyptus.simplequeue.ListDeadLetterSourceQueuesResponseType" extends="com.eucalyptus.simplequeue.SimpleQueueMessage">
Expand Down

0 comments on commit 42ac981

Please sign in to comment.