You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/09/29 19:23:07 UTC
svn commit: r1527357 - in /qpid/trunk/qpid/java/common: ./ templates/method/
templates/method/version/ templates/model/ templates/model/version/
Author: robbie
Date: Sun Sep 29 17:23:06 2013
New Revision: 1527357
URL: http://svn.apache.org/r1527357
Log:
QPID-5192: update protocol generation templates to remove whitespace errors in and improve readability of generated classes
Modified:
qpid/trunk/qpid/java/common/Composite.tpl
qpid/trunk/qpid/java/common/Constant.tpl
qpid/trunk/qpid/java/common/Enum.tpl
qpid/trunk/qpid/java/common/Invoker.tpl
qpid/trunk/qpid/java/common/MethodDelegate.tpl
qpid/trunk/qpid/java/common/Option.tpl
qpid/trunk/qpid/java/common/StructFactory.tpl
qpid/trunk/qpid/java/common/Type.tpl
qpid/trunk/qpid/java/common/templates/method/MethodBodyInterface.vm
qpid/trunk/qpid/java/common/templates/method/version/MethodBodyClass.vm
qpid/trunk/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm
qpid/trunk/qpid/java/common/templates/model/MethodDispatcherInterface.vm
qpid/trunk/qpid/java/common/templates/model/MethodRegistryClass.vm
qpid/trunk/qpid/java/common/templates/model/ProtocolVersionListClass.vm
qpid/trunk/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm
qpid/trunk/qpid/java/common/templates/model/version/ClientMethodDispatcherInterface.vm
qpid/trunk/qpid/java/common/templates/model/version/MethodDispatcherInterface.vm
qpid/trunk/qpid/java/common/templates/model/version/MethodRegistryClass.vm
qpid/trunk/qpid/java/common/templates/model/version/ServerMethodDispatcherInterface.vm
Modified: qpid/trunk/qpid/java/common/Composite.tpl
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/Composite.tpl?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/Composite.tpl (original)
+++ qpid/trunk/qpid/java/common/Composite.tpl Sun Sep 29 17:23:06 2013
@@ -1,6 +1,6 @@
package org.apache.qpid.transport;
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@ package org.apache.qpid.transport;
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
Modified: qpid/trunk/qpid/java/common/Constant.tpl
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/Constant.tpl?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/Constant.tpl (original)
+++ qpid/trunk/qpid/java/common/Constant.tpl Sun Sep 29 17:23:06 2013
@@ -1,6 +1,6 @@
package org.apache.qpid.transport;
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@ package org.apache.qpid.transport;
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
Modified: qpid/trunk/qpid/java/common/Enum.tpl
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/Enum.tpl?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/Enum.tpl (original)
+++ qpid/trunk/qpid/java/common/Enum.tpl Sun Sep 29 17:23:06 2013
@@ -1,6 +1,6 @@
package org.apache.qpid.transport;
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@ package org.apache.qpid.transport;
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
Modified: qpid/trunk/qpid/java/common/Invoker.tpl
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/Invoker.tpl?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/Invoker.tpl (original)
+++ qpid/trunk/qpid/java/common/Invoker.tpl Sun Sep 29 17:23:06 2013
@@ -1,6 +1,6 @@
package org.apache.qpid.transport;
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@ package org.apache.qpid.transport;
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
Modified: qpid/trunk/qpid/java/common/MethodDelegate.tpl
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/MethodDelegate.tpl?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/MethodDelegate.tpl (original)
+++ qpid/trunk/qpid/java/common/MethodDelegate.tpl Sun Sep 29 17:23:06 2013
@@ -1,6 +1,6 @@
package org.apache.qpid.transport;
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@ package org.apache.qpid.transport;
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
Modified: qpid/trunk/qpid/java/common/Option.tpl
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/Option.tpl?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/Option.tpl (original)
+++ qpid/trunk/qpid/java/common/Option.tpl Sun Sep 29 17:23:06 2013
@@ -1,6 +1,6 @@
package org.apache.qpid.transport;
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@ package org.apache.qpid.transport;
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
Modified: qpid/trunk/qpid/java/common/StructFactory.tpl
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/StructFactory.tpl?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/StructFactory.tpl (original)
+++ qpid/trunk/qpid/java/common/StructFactory.tpl Sun Sep 29 17:23:06 2013
@@ -1,6 +1,6 @@
package org.apache.qpid.transport;
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@ package org.apache.qpid.transport;
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
Modified: qpid/trunk/qpid/java/common/Type.tpl
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/Type.tpl?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/Type.tpl (original)
+++ qpid/trunk/qpid/java/common/Type.tpl Sun Sep 29 17:23:06 2013
@@ -1,6 +1,6 @@
package org.apache.qpid.transport;
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@ package org.apache.qpid.transport;
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
Modified: qpid/trunk/qpid/java/common/templates/method/MethodBodyInterface.vm
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/templates/method/MethodBodyInterface.vm?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/templates/method/MethodBodyInterface.vm (original)
+++ qpid/trunk/qpid/java/common/templates/method/MethodBodyInterface.vm Sun Sep 29 17:23:06 2013
@@ -2,16 +2,11 @@
#set( $name = "${name.substring(0,1).toUpperCase()}${name.substring(1)}" )
#end
#macro( toUpperCamel $name )${name.substring(0,1).toUpperCase()}${name.substring(1)}#end
-
-
-
#set( $amqp_ClassName = $amqpClass.Name)
#UpperCamel( $amqp_ClassName )
#set( $amqp_MethodName = $amqpMethod.Name )
#UpperCamel( $amqp_MethodName )
#set( $javaClassName = "${amqp_ClassName}${amqp_MethodName}Body" )
-
-
#set( $filename = "${javaClassName}.java")
/*
*
@@ -22,9 +17,9 @@
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -41,22 +36,15 @@
* $supportedVersion.getMajor()-$supportedVersion.getMinor()
#end
*/
-
-
-package org.apache.qpid.framing;
+package org.apache.qpid.framing;
public interface ${javaClassName} extends EncodableAMQDataBlock, AMQMethodBody
{
-
-
#foreach( $field in $amqpMethod.Fields )
#if( $amqpMethod.isCommon( $field ) )
public $field.ConsistentNativeType get#toUpperCamel( ${field.Name} )();
#end
#end
-
-
-
}
Modified: qpid/trunk/qpid/java/common/templates/method/version/MethodBodyClass.vm
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/templates/method/version/MethodBodyClass.vm?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/templates/method/version/MethodBodyClass.vm (original)
+++ qpid/trunk/qpid/java/common/templates/method/version/MethodBodyClass.vm Sun Sep 29 17:23:06 2013
@@ -19,9 +19,9 @@
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -36,10 +36,9 @@
* Supported AMQP version:
* $version.getMajor()-$version.getMinor()
*/
-
+
#set( $clazz = $amqpClass.asSingleVersionClass( $version ) )
#set( $method = $amqpMethod.asSingleVersionMethod( $version ) )
-
package org.apache.qpid.framing.amqp_$version.getMajor()_$version.getMinor();
import org.apache.qpid.codec.MarkableDataInput;
@@ -57,37 +56,29 @@ public class ${javaClassName} extends AM
{
return new ${javaClassName}(in);
}
-
-
};
-
-
+
public static AMQMethodBodyInstanceFactory getFactory()
{
return FACTORY_INSTANCE;
}
- public static final int CLASS_ID = $clazz.ClassId;
-
- public static final int METHOD_ID = $method.MethodId;
-
+ public static final int CLASS_ID = $clazz.ClassId;
+ public static final int METHOD_ID = $method.MethodId;
-
// Fields declared in specification
#foreach( $field in $method.ConsolidatedFields )
private final $field.NativeType _$field.getName(); // $field.UnderlyingFields
#end
-
// Constructor
-
public ${javaClassName}(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
{
#foreach( $field in $method.ConsolidatedFields )
_$field.Name = read$field.getEncodingType()( buffer );
#end
- }
-
+ }
+
public ${javaClassName}(
#foreach( $field in $method.FieldList )
#if( $velocityCount == $method.getFieldList().size() )
@@ -109,35 +100,34 @@ public class ${javaClassName} extends AM
byte $consolidatedFieldName = (byte)0;
#end
if( $field.Name )
- {
+ {
$consolidatedFieldName = (byte) (((int) $consolidatedFieldName) | (1 << $method.getPositionInBitField( $field.Name )));
- }
+ }
#if( $velocityCount == $method.getFieldList().size())
- _$consolidatedFieldName = $consolidatedFieldName;
-#else
-
-#end
+ _$consolidatedFieldName = $consolidatedFieldName;
+#else
+
+#end
#else
#if( !$consolidatedFieldName.equals("") )
- _$consolidatedFieldName = $consolidatedFieldName;
+ _$consolidatedFieldName = $consolidatedFieldName;
#end
#set( $consolidatedFieldName = "" )
_$field.Name = $field.Name;
#end
#end
}
-
- public int getClazz()
- {
- return CLASS_ID;
- }
-
- public int getMethod()
- {
- return METHOD_ID;
+
+ public int getClazz()
+ {
+ return CLASS_ID;
+ }
+
+ public int getMethod()
+ {
+ return METHOD_ID;
}
-
#foreach( $field in $method.FieldList )
public final $field.NativeType get#toUpperCamel( ${field.Name} )()
{
@@ -150,20 +140,20 @@ public class ${javaClassName} extends AM
#end
protected int getBodySize()
- {
+ {
#set( $fixedSize = 0 )
#foreach( $field in $method.ConsolidatedFields )
-#if( $field.isFixedSize() )
+#if( $field.isFixedSize() )
#set( $fixedSize = $fixedSize + $field.Size )
#end
#end
- int size = $fixedSize;
+ int size = $fixedSize;
#foreach( $field in $method.ConsolidatedFields )
-#if( ! $field.isFixedSize() )
+#if( ! $field.isFixedSize() )
size += getSizeOf( _$field.Name );
#end
#end
- return size;
+ return size;
}
public void writeMethodPayload(DataOutput buffer) throws IOException
@@ -179,32 +169,28 @@ public class ${javaClassName} extends AM
#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
#if( $amqpMethod.inAllVersions() )
- return dispatcher.dispatch${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}(this, channelId);
+ return dispatcher.dispatch${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}(this, channelId);
#else
- return ((MethodDispatcher_$version.getMajor()_$version.getMinor())dispatcher).dispatch${amqp_ClassName}${amqpMethodNameUpperCamel}(this, channelId);
-
-#end
-
+ return ((MethodDispatcher_$version.getMajor()_$version.getMinor())dispatcher).dispatch${amqp_ClassName}${amqpMethodNameUpperCamel}(this, channelId);
+#end
}
-
-
+
public String toString()
{
StringBuilder buf = new StringBuilder("[$javaClassName: ");
#foreach( $field in $method.FieldList )
buf.append( "$field.Name=" );
#if( $field.NativeType == "byte[]" )
- buf.append( get#toUpperCamel( $field.Name )() == null ? "null" : java.util.Arrays.toString( get#toUpperCamel( $field.Name )() ) );
+ buf.append( get#toUpperCamel( $field.Name )() == null ? "null" : java.util.Arrays.toString( get#toUpperCamel( $field.Name )() ) );
#else
- buf.append( get#toUpperCamel( $field.Name )() );
+ buf.append( get#toUpperCamel( $field.Name )() );
#end
#if( $velocityCount != $method.FieldList.size() )
- buf.append( ", " );
+ buf.append( ", " );
#end
#end
buf.append("]");
return buf.toString();
}
-
}
Modified: qpid/trunk/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm (original)
+++ qpid/trunk/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm Sun Sep 29 17:23:06 2013
@@ -8,9 +8,9 @@
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,12 +27,11 @@
* $supportedVersion.getMajor()-$supportedVersion.getMinor()
#end
*/
-
+
package org.apache.qpid.framing;
import org.apache.qpid.AMQException;
-
public interface ClientMethodDispatcher
{
@@ -48,7 +47,7 @@ public interface ClientMethodDispatcher
#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
public boolean dispatch${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}(${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body body, int channelId) throws AMQException;
-#end
+#end
#end
#end
#end
Modified: qpid/trunk/qpid/java/common/templates/model/MethodDispatcherInterface.vm
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/templates/model/MethodDispatcherInterface.vm?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/templates/model/MethodDispatcherInterface.vm (original)
+++ qpid/trunk/qpid/java/common/templates/model/MethodDispatcherInterface.vm Sun Sep 29 17:23:06 2013
@@ -1,36 +1,36 @@
-#set( $filename = "MethodDispatcher.java")
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by $generator - do not modify.
- * Supported AMQP version:
- #foreach( $supportedVersion in $model.VersionSet )
- * $supportedVersion.getMajor()-$supportedVersion.getMinor()
- #end
- */
-
-package org.apache.qpid.framing;
-
-public interface MethodDispatcher extends
- ClientMethodDispatcher, ServerMethodDispatcher
-{
-}
+#set( $filename = "MethodDispatcher.java")
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+/*
+ * This file is auto-generated by $generator - do not modify.
+ * Supported AMQP version:
+ #foreach( $supportedVersion in $model.VersionSet )
+ * $supportedVersion.getMajor()-$supportedVersion.getMinor()
+ #end
+ */
+
+package org.apache.qpid.framing;
+
+public interface MethodDispatcher extends
+ ClientMethodDispatcher, ServerMethodDispatcher
+{
+}
Modified: qpid/trunk/qpid/java/common/templates/model/MethodRegistryClass.vm
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/templates/model/MethodRegistryClass.vm?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/templates/model/MethodRegistryClass.vm (original)
+++ qpid/trunk/qpid/java/common/templates/model/MethodRegistryClass.vm Sun Sep 29 17:23:06 2013
@@ -8,9 +8,9 @@
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,7 +27,7 @@
* $supportedVersion.getMajor()-$supportedVersion.getMinor()
#end
*/
-
+
package org.apache.qpid.framing;
import java.io.IOException;
@@ -48,12 +48,10 @@ public abstract class MethodRegistry
#set( $verName = "_$supportedVersion.getMajor()_$supportedVersion.getMinor()" )
#set( $regPackage = "org.apache.qpid.framing.amqp$verName" )
- public static final MethodRegistry registry_$supportedVersion.getMajor()_$supportedVersion.getMinor() =
- new ${regPackage}.MethodRegistry${verName}();
-
+ public static final MethodRegistry registry_$supportedVersion.getMajor()_$supportedVersion.getMinor() =
+ new ${regPackage}.MethodRegistry${verName}();
#end
-
-
+
public abstract AMQMethodBody convertToBody(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException;
@@ -61,7 +59,6 @@ public abstract class MethodRegistry
public abstract int getMaxMethodId(int classId);
-
protected MethodRegistry(ProtocolVersion pv)
{
_registries.put(pv, this);
@@ -84,22 +81,18 @@ public abstract class MethodRegistry
#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) )
#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
- public abstract ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body create${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body(
+ public abstract ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body create${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body(
#foreach( $field in $amqpMethod.FieldList )
#if( $velocityCount == $amqpMethod.getFieldList().size() )
final $field.NativeType $field.Name
#else
final $field.NativeType $field.Name,
#end
-#end
- );
-
-
+#end
+ );
#end
#end
#end
-
- public abstract ProtocolVersionMethodConverter getProtocolVersionMethodConverter();
-
+ public abstract ProtocolVersionMethodConverter getProtocolVersionMethodConverter();
}
Modified: qpid/trunk/qpid/java/common/templates/model/ProtocolVersionListClass.vm
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/templates/model/ProtocolVersionListClass.vm?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/templates/model/ProtocolVersionListClass.vm (original)
+++ qpid/trunk/qpid/java/common/templates/model/ProtocolVersionListClass.vm Sun Sep 29 17:23:06 2013
@@ -8,9 +8,9 @@
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
-*
+*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -36,14 +36,12 @@ import java.util.TreeSet;
import java.util.Map;
import java.util.HashMap;
-
public class ProtocolVersion implements Comparable
{
private final byte _majorVersion;
private final byte _minorVersion;
private final String _stringFormat;
-
public ProtocolVersion(byte majorVersion, byte minorVersion)
{
_majorVersion = majorVersion;
@@ -66,7 +64,6 @@ public class ProtocolVersion implements
return _minorVersion > 90 ? (byte) (_minorVersion / 10) : _minorVersion;
}
-
public byte getRevisionVersion()
{
return _minorVersion > 90 ? (byte) (_minorVersion % 10) : (byte) 0;
@@ -77,28 +74,27 @@ public class ProtocolVersion implements
return _stringFormat;
}
-
public int compareTo(Object o)
{
ProtocolVersion pv = (ProtocolVersion) o;
-
- /*
- * 0-8 has it's major and minor numbers the wrong way round (it's actually 8-0)...
- * so we need to deal with that case specially
- */
-
+
+ /*
+ * 0-8 has it's major and minor numbers the wrong way round (it's actually 8-0)...
+ * so we need to deal with that case specially
+ */
+
if((_majorVersion == (byte) 8) && (_minorVersion == (byte) 0))
- {
- ProtocolVersion fixedThis = new ProtocolVersion(_minorVersion, _majorVersion);
- return fixedThis.compareTo(pv);
- }
-
- if((pv.getMajorVersion() == (byte) 8) && (pv.getMinorVersion() == (byte) 0))
- {
- ProtocolVersion fixedOther = new ProtocolVersion(pv.getMinorVersion(), pv.getMajorVersion());
- return this.compareTo(fixedOther);
- }
-
+ {
+ ProtocolVersion fixedThis = new ProtocolVersion(_minorVersion, _majorVersion);
+ return fixedThis.compareTo(pv);
+ }
+
+ if((pv.getMajorVersion() == (byte) 8) && (pv.getMinorVersion() == (byte) 0))
+ {
+ ProtocolVersion fixedOther = new ProtocolVersion(pv.getMinorVersion(), pv.getMajorVersion());
+ return this.compareTo(fixedOther);
+ }
+
if(_majorVersion > pv.getMajorVersion())
{
return 1;
@@ -131,71 +127,63 @@ public class ProtocolVersion implements
{
return (0xFF & (int)_minorVersion) | ((0xFF & (int)_majorVersion) << 8);
}
-
-
+
public boolean isSupported()
{
return _supportedVersions.contains(this);
}
-
+
public static ProtocolVersion getLatestSupportedVersion()
{
return _supportedVersions.last();
}
-
+
private static final SortedSet<ProtocolVersion> _supportedVersions;
- private static final Map<String, ProtocolVersion> _nameToVersionMap =
- new HashMap<String, ProtocolVersion>();
- private static final ProtocolVersion _defaultVersion;
+ private static final Map<String, ProtocolVersion> _nameToVersionMap =
+ new HashMap<String, ProtocolVersion>();
+ private static final ProtocolVersion _defaultVersion;
-
public static final ProtocolVersion v0_10 = new ProtocolVersion((byte)0,(byte)10);
#foreach( $version in $model.getVersionSet() )
#set( $versionId = "v$version.getMajor()_$version.getMinor()" )
public static final ProtocolVersion $versionId = new ProtocolVersion((byte)$version.getMajor(),(byte)$version.getMinor());
#end
-
-
+
static
{
SortedSet<ProtocolVersion> versions = new TreeSet<ProtocolVersion>();
- versions.add(v0_10);
- _nameToVersionMap.put("0-10", v0_10);
+ versions.add(v0_10);
+ _nameToVersionMap.put("0-10", v0_10);
#foreach( $version in $model.getVersionSet() )
#set( $versionId = "v$version.getMajor()_$version.getMinor()" )
versions.add($versionId);
- _nameToVersionMap.put("${version.getMajor()}-${version.getMinor()}", $versionId);
+ _nameToVersionMap.put("${version.getMajor()}-${version.getMinor()}", $versionId);
#end
_supportedVersions = Collections.unmodifiableSortedSet(versions);
-
-
- ProtocolVersion systemDefinedVersion =
- _nameToVersionMap.get(System.getProperty("org.apache.qpid.amqp_version"));
-
- _defaultVersion = (systemDefinedVersion == null)
- ? getLatestSupportedVersion()
- : systemDefinedVersion;
+
+ ProtocolVersion systemDefinedVersion =
+ _nameToVersionMap.get(System.getProperty("org.apache.qpid.amqp_version"));
+
+ _defaultVersion = (systemDefinedVersion == null)
+ ? getLatestSupportedVersion()
+ : systemDefinedVersion;
}
-
public static SortedSet<ProtocolVersion> getSupportedProtocolVersions()
{
return _supportedVersions;
}
-
-
public static ProtocolVersion parse(String name)
{
return _nameToVersionMap.get(name);
}
-
+
public static ProtocolVersion defaultProtocolVersion()
{
return _defaultVersion;
}
-
}
Modified: qpid/trunk/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm (original)
+++ qpid/trunk/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm Sun Sep 29 17:23:06 2013
@@ -8,9 +8,9 @@
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,12 +27,11 @@
* $supportedVersion.getMajor()-$supportedVersion.getMinor()
#end
*/
-
+
package org.apache.qpid.framing;
import org.apache.qpid.AMQException;
-
public interface ServerMethodDispatcher
{
@@ -48,7 +47,7 @@ public interface ServerMethodDispatcher
#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
public boolean dispatch${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}(${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body body, int channelId) throws AMQException;
-#end
+#end
#end
#end
#end
Modified: qpid/trunk/qpid/java/common/templates/model/version/ClientMethodDispatcherInterface.vm
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/templates/model/version/ClientMethodDispatcherInterface.vm?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/templates/model/version/ClientMethodDispatcherInterface.vm (original)
+++ qpid/trunk/qpid/java/common/templates/model/version/ClientMethodDispatcherInterface.vm Sun Sep 29 17:23:06 2013
@@ -8,9 +8,9 @@
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,13 +27,12 @@
* $supportedVersion.getMajor()-$supportedVersion.getMinor()
#end
*/
-
+
package org.apache.qpid.framing.amqp_$version.getMajor()_$version.getMinor();
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.*;
-
public interface ClientMethodDispatcher_${version.getMajor()}_${version.getMinor()} extends ClientMethodDispatcher
{
Modified: qpid/trunk/qpid/java/common/templates/model/version/MethodDispatcherInterface.vm
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/templates/model/version/MethodDispatcherInterface.vm?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/templates/model/version/MethodDispatcherInterface.vm (original)
+++ qpid/trunk/qpid/java/common/templates/model/version/MethodDispatcherInterface.vm Sun Sep 29 17:23:06 2013
@@ -8,9 +8,9 @@
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,14 +27,14 @@
* $supportedVersion.getMajor()-$supportedVersion.getMinor()
#end
*/
-
+
package org.apache.qpid.framing.amqp_$version.getMajor()_$version.getMinor();
import org.apache.qpid.framing.*;
-public interface MethodDispatcher_${version.getMajor()}_${version.getMinor()}
+public interface MethodDispatcher_${version.getMajor()}_${version.getMinor()}
extends MethodDispatcher,
- ServerMethodDispatcher_${version.getMajor()}_${version.getMinor()},
+ ServerMethodDispatcher_${version.getMajor()}_${version.getMinor()},
ClientMethodDispatcher_${version.getMajor()}_${version.getMinor()}
{
Modified: qpid/trunk/qpid/java/common/templates/model/version/MethodRegistryClass.vm
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/templates/model/version/MethodRegistryClass.vm?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/templates/model/version/MethodRegistryClass.vm (original)
+++ qpid/trunk/qpid/java/common/templates/model/version/MethodRegistryClass.vm Sun Sep 29 17:23:06 2013
@@ -8,9 +8,9 @@
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -25,7 +25,7 @@
* Supported AMQP version:
* $version.getMajor()-$version.getMinor()
*/
-
+
package org.apache.qpid.framing.amqp_${version.getMajor()}_${version.getMinor()};
import org.apache.qpid.framing.*;
@@ -43,25 +43,23 @@ import org.apache.qpid.codec.MarkableDat
public class MethodRegistry_$version.getMajor()_$version.getMinor() extends MethodRegistry
{
-
+
private static final Logger _log = LoggerFactory.getLogger(MethodRegistry.class);
private ProtocolVersionMethodConverter _protocolVersionConverter = new MethodConverter_$version.getMajor()_$version.getMinor()();
-
-#set( $specificModel = $model.asSingleVersionModel() )
-
-
-#set( $maxClassId = $specificModel.getMaximumClassId()+1 )
+
+#set( $specificModel = $model.asSingleVersionModel() )
+#set( $maxClassId = $specificModel.getMaximumClassId()+1 )
private final AMQMethodBodyInstanceFactory[][] _factories = new AMQMethodBodyInstanceFactory[$maxClassId][];
public MethodRegistry_$version.getMajor()_$version.getMinor()()
{
this(new ProtocolVersion((byte)$version.getMajor(),(byte)$version.getMinor()));
}
-
+
public MethodRegistry_$version.getMajor()_$version.getMinor()(ProtocolVersion pv)
{
- super(pv);
+ super(pv);
#foreach( $amqpClass in $specificModel.getClassList() )
#set( $amqpClassNameFirstChar = $amqpClass.getName().substring(0,1) )
#set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() )
@@ -71,28 +69,24 @@ public class MethodRegistry_$version.get
// Register method body instance factories for the $amqpClassNameUpperCamel class.
-#set( $maxMethodId = $amqpClass.getMaximumMethodId()+1 )
+#set( $maxMethodId = $amqpClass.getMaximumMethodId()+1 )
_factories[$amqpClass.getClassId()] = new AMQMethodBodyInstanceFactory[$maxMethodId];
-
+
#foreach( $amqpMethod in $amqpClass.getMethodList() )
#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) )
#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
- _factories[$amqpClass.getClassId()][$amqpMethod.getMethodId()] = ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}BodyImpl.getFactory();
-#end
-
+ _factories[$amqpClass.getClassId()][$amqpMethod.getMethodId()] = ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}BodyImpl.getFactory();
+#end
#end
-
-
}
-
public AMQMethodBody convertToBody(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
{
int classId = in.readUnsignedShort();
int methodId = in.readUnsignedShort();
-
+
AMQMethodBodyInstanceFactory bodyFactory;
try
{
@@ -122,7 +116,6 @@ public class MethodRegistry_$version.get
}
}
-
if (bodyFactory == null)
{
throw new AMQFrameDecodingException(AMQConstant.COMMAND_INVALID,
@@ -130,44 +123,38 @@ public class MethodRegistry_$version.get
+ " (while trying to decode class " + classId + " method " + methodId + ".");
}
-
return bodyFactory.newInstance(in, size);
-
-
}
-
public int getMaxClassId()
{
return $specificModel.getMaximumClassId();
}
-
+
public int getMaxMethodId(int classId)
{
- return _factories[classId].length - 1;
+ return _factories[classId].length - 1;
}
-
-
#foreach( $amqpClass in $specificModel.getClassList() )
#set( $amqpClassNameFirstChar = $amqpClass.getName().substring(0,1) )
#set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() )
#set( $amqpClassNameUpperCamel = "$amqpClassNameFirstCharU$amqpClass.getName().substring(1)" )
-
+
#foreach( $amqpMethod in $amqpClass.getMethodList() )
#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) )
#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
- public ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body create${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body(
+ public ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body create${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body(
#foreach( $field in $amqpMethod.FieldList )
#if( $velocityCount == $amqpMethod.getFieldList().size() )
final $field.NativeType $field.Name
#else
final $field.NativeType $field.Name,
#end
-#end
- )
+#end
+ )
{
return new ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}BodyImpl(
#foreach( $field in $amqpMethod.FieldList )
@@ -176,19 +163,17 @@ public class MethodRegistry_$version.get
#else
$field.Name,
#end
-#end
- );
+#end
+ );
}
-
-#end
-
+
+#end
+
#end
-
-
+
public ProtocolVersionMethodConverter getProtocolVersionMethodConverter()
{
return _protocolVersionConverter;
- }
+ }
-
}
Modified: qpid/trunk/qpid/java/common/templates/model/version/ServerMethodDispatcherInterface.vm
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/templates/model/version/ServerMethodDispatcherInterface.vm?rev=1527357&r1=1527356&r2=1527357&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/templates/model/version/ServerMethodDispatcherInterface.vm (original)
+++ qpid/trunk/qpid/java/common/templates/model/version/ServerMethodDispatcherInterface.vm Sun Sep 29 17:23:06 2013
@@ -8,9 +8,9 @@
* to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,7 +27,7 @@
* $supportedVersion.getMajor()-$supportedVersion.getMinor()
#end
*/
-
+
package org.apache.qpid.framing.amqp_$version.getMajor()_$version.getMinor();
import org.apache.qpid.AMQException;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org