merging in from default

Author: Matthew Sackman

codegen.py

@@ -130,16 +130,6 @@ def printClassInterfaces():
                     print "            %s %s();" % (java_field_type(spec, a.domain), java_getter_name(a.name))
                 print "        }"
             print "    }"
-
-
-    def printClone(c):
-        print
-        print """        public Object clone()
-            throws CloneNotSupportedException
-        {
-            return super.clone();
-        }""" % \
-        {"n": java_class_name(c.name)}
 
     def printReadProperties(c):
         print
@@ -180,10 +170,11 @@ def printPropertyDebug(c):
 
     def printClassProperties(c):
         print
-        print "    public static class %s extends AMQContentHeader implements Cloneable {" % ( java_class_name(c.name) + 'Properties')
+        print "    public static class %(className)s extends %(parentClass)s {" % {'className' : java_class_name(c.name) + 'Properties', 'parentClass' : 'com.rabbitmq.client.impl.AMQ' + java_class_name(c.name) + 'Properties'}
         #property fields
         for f in c.fields:
-            print "        public %s %s;" % (java_property_type(spec, f.domain),java_field_name(f.name))
+            print "        private %s %s;" % (java_property_type(spec, f.domain),java_field_name(f.name))
+
         #constructor
         if c.fields:
             print
@@ -204,13 +195,21 @@ def printClassProperties(c):
         print "        public %sProperties() {}" % (java_class_name(c.name))
         print "        public int getClassId() { return %i; }" % (c.index)
         print "        public java.lang.String getClassName() { return \"%s\"; }" % (c.name)
+        
+        #access functions
+        print
+        for f in c.fields:
+            print """        public %(fieldType)s get%(capFieldName)s() { return %(fieldName)s; }
+        public void set%(capFieldName)s(%(fieldType)s %(fieldName)s) { this.%(fieldName)s = %(fieldName)s; }""" % \
+            {'fieldType' : java_property_type(spec, f.domain), \
+            'capFieldName' : (java_field_name(f.name)[0].upper() + java_field_name(f.name)[1:]), \
+            'fieldName' : java_field_name(f.name)}
 
-        printClone(c)
         printReadProperties(c)
         printWriteProperties(c)
         printPropertyDebug(c)
         print "    }"
-        
+
     printHeader()
     printConstants()
     printClassInterfaces()

src/com/rabbitmq/client/BasicProperties.java

@@ -0,0 +1,206 @@
+//   The contents of this file are subject to the Mozilla Public License
+//   Version 1.1 (the "License"); you may not use this file except in
+//   compliance with the License. You may obtain a copy of the License at
+//   http://www.mozilla.org/MPL/
+//
+//   Software distributed under the License is distributed on an "AS IS"
+//   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+//   License for the specific language governing rights and limitations
+//   under the License.
+//
+//   The Original Code is RabbitMQ.
+//
+//   The Initial Developers of the Original Code are LShift Ltd,
+//   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+//
+//   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+//   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+//   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+//   Technologies LLC, and Rabbit Technologies Ltd.
+//
+//   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+//   Ltd. Portions created by Cohesive Financial Technologies LLC are
+//   Copyright (C) 2007-2009 Cohesive Financial Technologies
+//   LLC. Portions created by Rabbit Technologies Ltd are Copyright
+//   (C) 2007-2009 Rabbit Technologies Ltd.
+//
+//   All Rights Reserved.
+//
+//   Contributor(s): ______________________________________.
+//
+package com.rabbitmq.client;
+
+import java.util.Date;
+import java.util.Map;
+
+public interface BasicProperties {
+    
+    /**
+     * Retrieve the value in the contentType field.
+     * @return contentType field, or null if the field has not been set.
+     */
+    public abstract String getContentType();
+    
+    /**
+     * Retrieve the value in the contentEncoding field.
+     * @return contentEncoding field, or null if the field has not been set.
+     */
+    public abstract String getContentEncoding();
+    
+    /**
+     * Retrieve the table in the headers field as a map of fields names and
+     * values. 
+     * @return headers table, or null if the headers field has not been set.
+     */
+    public abstract Map<String, Object> getHeaders();
+    
+    /**
+     * Retrieve the value in the deliveryMode field.
+     * @return deliveryMode field, or null if the field has not been set.
+     */
+    public abstract Integer getDeliveryMode();
+    
+    /**
+     * Retrieve the value in the priority field.
+     * @return priority field, or null if the field has not been set.
+     */
+    public abstract Integer getPriority();
+    
+    /**
+     * Retrieve the value in the correlationId field.
+     * @return correlationId field, or null if the field has not been set.
+     */
+    public abstract String getCorrelationId();
+    
+    /**
+     * Retrieve the value in the replyTo field.
+     * @return replyTo field, or null if the field has not been set.
+     */
+    public abstract String getReplyTo();
+    
+    /**
+     * Retrieve the value in the expiration field.
+     * @return expiration field, or null if the field has not been set.
+     */
+    public abstract String getExpiration();
+    
+    /**
+     * Retrieve the value in the messageId field.
+     * @return messageId field, or null if the field has not been set.
+     */
+    public abstract String getMessageId();
+    
+    /**
+     * Retrieve the value in the timestamp field.
+     * @return timestamp field, or null if the field has not been set.
+     */
+    public abstract Date getTimestamp();
+    
+    /**
+     * Retrieve the value in the type field.
+     * @return type field, or null if the field has not been set.
+     */
+    public abstract String getType();
+    
+    /**
+     * Retrieve the value in the userId field.
+     * @return userId field, or null if the field has not been set.
+     */
+    public abstract String getUserId();
+    
+    /**
+     * Retrieve the value in the appId field.
+     * @return appId field, or null if the field has not been set.
+     */
+    public abstract String getAppId();
+    
+    /**
+     * Retrieve the value in the clusterId field.
+     * @return clusterId field, or null if the field has not been set.
+     */
+    public abstract String getClusterId();
+
+    /**
+     * Set the contentType field, or null indicating the field is not set
+     * @param contentType the value to set the field to
+     */
+    public abstract void setContentType(String contentType);
+    
+    /**
+     * Set the contentEncoding field, or null indicating the field is not set
+     * @param contentEncoding - the value to set the field to
+     */
+    public abstract void setContentEncoding(String contentEncoding);
+    
+    /**
+     * Set the headers table, or null indicating the field is not set
+     * @param headers a map of table field names and values
+     */
+    public abstract void setHeaders(Map<String, Object> headers);
+    
+    /**
+     * Set the deliveryMode field, or null indicating the field is not set
+     * @param deliveryMode the value to set the field to
+     */
+    public abstract void setDeliveryMode(Integer deliveryMode);
+    
+    /**
+     * Set the priority field, or null indicating the field is not set
+     * @param priority the value to set the field to
+     */
+    public abstract void setPriority(Integer priority);
+    
+    /**
+     * Set the correlationId field, or null indicating the field is not set
+     * @param correlationId the value to set the field to
+     */
+    public abstract void setCorrelationId(String correlationId);
+    
+    /**
+     * Set the replyTo field, or null indicating the field is not set
+     * @param replyTo the value to set the field to
+     */
+    public abstract void setReplyTo(String replyTo);
+    
+    /**
+     * Set the expiration field, or null indicating the field is not set
+     * @param expiration the value to set the field to
+     */
+    public abstract void setExpiration(String expiration);
+    
+    /**
+     * Set the messageId field, or null indicating the field is not set
+     * @param messageId the value to set the field to
+     */
+    public abstract void setMessageId(String messageId);
+    
+    /**
+     * Set the timestamp field, or null indicating the field is not set
+     * @param timestamp the value to set the field to
+     */
+    public abstract void setTimestamp(Date timestamp);
+    
+    /**
+     * Set the type field, or null indicating the field is not set
+     * @param type the value to set the field to
+     */
+    public abstract void setType(String type);
+    
+    /**
+     * Set the userId field, or null indicating the field is not set
+     * @param userId the value to set the field to
+     */
+    public abstract void setUserId(String userId);
+    
+    /**
+     * Set the appId field, or null indicating the field is not set
+     * @param appId the value to set the field to
+     */
+    public abstract void setAppId(String appId);
+    
+    /**
+     * Set the clusterId field, or null indicating the field is not set
+     * @param clusterId the value to set the field to
+     */
+    public abstract void setClusterId(String clusterId);
+}

src/com/rabbitmq/client/Channel.java

@@ -355,6 +355,27 @@ Queue.DeclareOk queueDeclare(String queue, boolean passive, boolean durable, boo
      */
     Queue.UnbindOk queueUnbind(String queue, String exchange, String routingKey, Map<String, Object> arguments) throws IOException;
 
+    /**
+     * Purges the contents of the given queue and awaits a completion.
+     * @see com.rabbitmq.client.AMQP.Queue.Purge
+     * @see com.rabbitmq.client.AMQP.Queue.PurgeOk
+     * @param queue the name of the queue
+     * @return a purge-confirm method if the purge was executed succesfully
+     * @throws java.io.IOException if an error is encountered
+     */
+    Queue.PurgeOk queuePurge(String queue) throws IOException;
+
+    /**
+     * Purges the contents of the given queue.
+     * @see com.rabbitmq.client.AMQP.Queue.Purge
+     * @see com.rabbitmq.client.AMQP.Queue.PurgeOk
+     * @param queue the name of the queue
+     * @param nowait whether to await completion of the purge 
+     * @return a purge-confirm method if the purge was executed succesfully
+     * @throws java.io.IOException if an error is encountered
+     */
+    Queue.PurgeOk queuePurge(String queue, boolean nowait) throws IOException;
+
     /**
      * Retrieve a message from a queue using {@link com.rabbitmq.client.AMQP.Basic.Get}
      * @see com.rabbitmq.client.AMQP.Basic.Get

src/com/rabbitmq/client/ContentHeader.java

@@ -35,7 +35,7 @@
  * Public API for abstract AMQP content header objects.
  */
 
-public interface ContentHeader {
+public interface ContentHeader extends Cloneable {
     /**
      * Retrieve the class ID (see the spec for a list of allowable IDs).
      * @return class ID of this ContentHeader. Properly an unsigned short, i.e. only the lowest 16 bits are significant